Skip to content

Commit

Permalink
[RemoveLegacy] Remove assorted unused multi-col methods.
Browse files Browse the repository at this point in the history
As above - there should be no behaviour change.

Bug: 1229581
Change-Id: I6a06e98cf5777cd473424bba4265eef0c78ba453
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5079722
Reviewed-by: Morten Stenshorne <mstensho@chromium.org>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Auto-Submit: Ian Kilpatrick <ikilpatrick@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1232514}
  • Loading branch information
bfgeek authored and Chromium LUCI CQ committed Dec 3, 2023
1 parent fec81a8 commit 94cb5c4
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 60 deletions.
15 changes: 0 additions & 15 deletions third_party/blink/renderer/core/layout/layout_multi_column_set.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,6 @@ class CORE_EXPORT LayoutMultiColumnSet final : public LayoutBlockFlow {
}
unsigned FragmentainerGroupIndexAtFlowThreadOffset(LayoutUnit,
PageBoundaryRule) const;
MultiColumnFragmentainerGroup& FragmentainerGroupAtFlowThreadOffset(
LayoutUnit flow_thread_offset,
PageBoundaryRule rule) {
NOT_DESTROYED();
UpdateGeometryIfNeeded();
return fragmentainer_groups_[FragmentainerGroupIndexAtFlowThreadOffset(
flow_thread_offset, rule)];
}
const MultiColumnFragmentainerGroup& FragmentainerGroupAtFlowThreadOffset(
LayoutUnit flow_thread_offset,
PageBoundaryRule rule) const {
Expand Down Expand Up @@ -152,13 +144,6 @@ class CORE_EXPORT LayoutMultiColumnSet final : public LayoutBlockFlow {

LayoutUnit LogicalTopInFlowThread() const;
LayoutUnit LogicalBottomInFlowThread() const;
LayoutUnit LogicalHeightInFlowThread() const {
NOT_DESTROYED();
// Due to negative margins, logical bottom may actually end up above logical
// top, but we never want to return negative logical heights.
return (LogicalBottomInFlowThread() - LogicalTopInFlowThread())
.ClampNegativeToZero();
}

// Return the amount of flow thread contents that the specified fragmentainer
// group can hold without overflowing.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,6 @@ class LayoutMultiColumnSpannerPlaceholder final : public LayoutBox {
NOT_DESTROYED();
return layout_object_in_flow_thread_.Get();
}
void MarkForLayoutIfObjectInFlowThreadNeedsLayout() {
NOT_DESTROYED();
if (!layout_object_in_flow_thread_->NeedsLayout())
return;
// The containing block of a spanner is the multicol container (our parent
// here), but the spanner is laid out via its spanner set (us), so we need
// to make sure that we enter it.
SetChildNeedsLayout(kMarkOnlyThis);
}

bool AnonymousHasStylePropagationOverride() final {
NOT_DESTROYED();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@ MultiColumnFragmentainerGroup::MultiColumnFragmentainerGroup(
const LayoutMultiColumnSet& column_set)
: column_set_(&column_set) {}

bool MultiColumnFragmentainerGroup::IsFirstGroup() const {
return &column_set_->FirstFragmentainerGroup() == this;
}

bool MultiColumnFragmentainerGroup::IsLastGroup() const {
return &column_set_->LastFragmentainerGroup() == this;
}

LogicalOffset MultiColumnFragmentainerGroup::OffsetFromColumnSet() const {
return LogicalOffset(LayoutUnit(), LogicalTop());
}
Expand Down Expand Up @@ -91,13 +83,6 @@ PhysicalOffset MultiColumnFragmentainerGroup::FlowThreadTranslationAtOffset(
return physical_column_rect.offset - portion_rect.offset;
}

LayoutUnit MultiColumnFragmentainerGroup::ColumnLogicalTopForOffset(
LayoutUnit offset_in_flow_thread) const {
unsigned column_index = ColumnIndexAtOffset(
offset_in_flow_thread, LayoutBox::kAssociateWithLatterPage);
return LogicalTopInFlowThreadAt(column_index);
}

LogicalOffset MultiColumnFragmentainerGroup::VisualPointToFlowThreadPoint(
const LogicalOffset& visual_point) const {
unsigned column_index = ColumnIndexAtVisualPoint(visual_point);
Expand Down Expand Up @@ -146,19 +131,6 @@ PhysicalRect MultiColumnFragmentainerGroup::FragmentsBoundingBox(
return UnionRect(start_column_rect, end_column_rect);
}

LogicalRect MultiColumnFragmentainerGroup::CalculateOverflow() const {
// Note that we just return the bounding rectangle of the column boxes here.
// We currently don't examine overflow caused by the actual content that ends
// up in each column.
LogicalRect overflow_rect;
if (unsigned column_count = ActualColumnCount()) {
overflow_rect = ColumnRectAt(0);
if (column_count > 1)
overflow_rect.UniteEvenIfEmpty(ColumnRectAt(column_count - 1));
}
return overflow_rect;
}

unsigned MultiColumnFragmentainerGroup::ActualColumnCount() const {
unsigned count = UnclampedActualColumnCount();
count = std::min(count, kColumnCountClampMax);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ class CORE_EXPORT MultiColumnFragmentainerGroup {
public:
explicit MultiColumnFragmentainerGroup(const LayoutMultiColumnSet&);

const LayoutMultiColumnSet& ColumnSet() const { return *column_set_; }

bool IsFirstGroup() const;
bool IsLastGroup() const;

// Position within the LayoutMultiColumnSet.
LayoutUnit LogicalTop() const { return logical_top_; }
void SetLogicalTop(LayoutUnit logical_top) { logical_top_ = logical_top; }
Expand Down Expand Up @@ -105,7 +100,6 @@ class CORE_EXPORT MultiColumnFragmentainerGroup {
PhysicalOffset FlowThreadTranslationAtOffset(
LayoutUnit,
LayoutBox::PageBoundaryRule) const;
LayoutUnit ColumnLogicalTopForOffset(LayoutUnit offset_in_flow_thread) const;

LogicalOffset VisualPointToFlowThreadPoint(
const LogicalOffset& visual_point) const;
Expand All @@ -125,8 +119,6 @@ class CORE_EXPORT MultiColumnFragmentainerGroup {
unsigned& first_column,
unsigned& last_column) const;

LogicalRect CalculateOverflow() const;

unsigned ColumnIndexAtOffset(LayoutUnit offset_in_flow_thread,
LayoutBox::PageBoundaryRule) const;

Expand Down

0 comments on commit 94cb5c4

Please sign in to comment.