Commit 9bf44be4 authored by Ian Kilpatrick's avatar Ian Kilpatrick Committed by Commit Bot

[cleanup] Rename Accumulate{InFlow,Relative}PositionOffsets.

The old code was also looking at sticky positioned offsets, but it looks
like position: sticky is generally broken with split inlines so couldn't
trigger a reliable bug.

Change-Id: I82bf9c0b5cdbfb316ca095e7acb574737c63678d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2215367
Commit-Queue: Koji Ishii <kojii@chromium.org>
Reviewed-by: default avatarKoji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772129}
parent c0173f1c
...@@ -4099,14 +4099,14 @@ bool LayoutBlockFlow::HitTestFloats(HitTestResult& result, ...@@ -4099,14 +4099,14 @@ bool LayoutBlockFlow::HitTestFloats(HitTestResult& result,
return false; return false;
} }
PhysicalOffset LayoutBlockFlow::AccumulateInFlowPositionOffsets() const { PhysicalOffset LayoutBlockFlow::AccumulateRelativePositionOffsets() const {
if (!IsAnonymousBlock() || !IsInFlowPositioned()) if (!IsAnonymousBlock() || !IsInFlowPositioned())
return PhysicalOffset(); return PhysicalOffset();
PhysicalOffset offset; PhysicalOffset offset;
for (const LayoutObject* p = InlineElementContinuation(); for (const LayoutObject* p = InlineElementContinuation();
p && p->IsLayoutInline(); p = p->Parent()) { p && p->IsLayoutInline(); p = p->Parent()) {
if (p->IsInFlowPositioned()) if (p->IsInFlowPositioned())
offset += ToLayoutInline(p)->OffsetForInFlowPosition(); offset += ToLayoutInline(p)->RelativePositionOffset();
} }
return offset; return offset;
} }
......
...@@ -538,7 +538,7 @@ class CORE_EXPORT LayoutBlockFlow : public LayoutBlock { ...@@ -538,7 +538,7 @@ class CORE_EXPORT LayoutBlockFlow : public LayoutBlock {
const PhysicalOffset& accumulated_offset, const PhysicalOffset& accumulated_offset,
HitTestAction) override; HitTestAction) override;
PhysicalOffset AccumulateInFlowPositionOffsets() const override; PhysicalOffset AccumulateRelativePositionOffsets() const override;
private: private:
void ResetLayout(); void ResetLayout();
......
...@@ -742,7 +742,7 @@ bool LayoutBoxModelObject::HasAutoHeightOrContainingBlockWithAutoHeight( ...@@ -742,7 +742,7 @@ bool LayoutBoxModelObject::HasAutoHeightOrContainingBlockWithAutoHeight(
PhysicalOffset LayoutBoxModelObject::RelativePositionOffset() const { PhysicalOffset LayoutBoxModelObject::RelativePositionOffset() const {
DCHECK(IsRelPositioned()); DCHECK(IsRelPositioned());
PhysicalOffset offset = AccumulateInFlowPositionOffsets(); PhysicalOffset offset = AccumulateRelativePositionOffsets();
LayoutBlock* containing_block = ContainingBlock(); LayoutBlock* containing_block = ContainingBlock();
......
...@@ -473,7 +473,7 @@ class CORE_EXPORT LayoutBoxModelObject : public LayoutObject { ...@@ -473,7 +473,7 @@ class CORE_EXPORT LayoutBoxModelObject : public LayoutObject {
// See continuation above for more details. // See continuation above for more details.
void SetContinuation(LayoutBoxModelObject*); void SetContinuation(LayoutBoxModelObject*);
virtual PhysicalOffset AccumulateInFlowPositionOffsets() const { virtual PhysicalOffset AccumulateRelativePositionOffsets() const {
return PhysicalOffset(); return PhysicalOffset();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment