Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(626)

Unified Diff: third_party/WebKit/Source/core/paint/PaintLayer.h

Issue 1308273010: Adapt and reland old position sticky implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Make sticky vertical ref tests expectations not dependent on font size. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/paint/PaintLayer.h
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.h b/third_party/WebKit/Source/core/paint/PaintLayer.h
index 26d5c2743437f147a4ff81c370372c8d32b93895..65f8de6c7c25ec2d531adb1c0b9b5fdbfe6c4399 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.h
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.h
@@ -269,6 +269,8 @@ public:
// Allows updates of layer content without invalidating paint.
void contentChanged(ContentChangeType);
+ void updateLayerPosition();
+
void updateLayerPositionsAfterLayout();
void updateLayerPositionsAfterOverflowScroll(const DoubleSize& scrollDelta);
@@ -536,6 +538,10 @@ public:
const PaintLayer* opacityAncestor;
const PaintLayer* transformAncestor;
const PaintLayer* filterAncestor;
+
+ // The fist ancestor which can scroll. This is a subset of the
+ // ancestorOverflowLayer chain where the scrolling layer is visible and
+ // has a larger scroll content than its bounds.
const PaintLayer* ancestorScrollingLayer;
const PaintLayer* nearestFixedPositionLayer;
@@ -565,6 +571,7 @@ public:
return m_needsDescendantDependentCompositingInputsUpdate;
}
+ void updateAncestorOverflowLayer(const PaintLayer* ancestorOverflowLayer) { m_ancestorOverflowLayer = ancestorOverflowLayer; }
void updateAncestorDependentCompositingInputs(const AncestorDependentCompositingInputs&, const RareAncestorDependentCompositingInputs&, bool hasAncestorWithClipPath);
void updateDescendantDependentCompositingInputs(bool hasDescendantWithClipPath, bool hasNonIsolatedDescendantWithBlendMode);
void didUpdateCompositingInputs();
@@ -574,6 +581,7 @@ public:
const PaintLayer* transformAncestor() const { ASSERT(!m_needsAncestorDependentCompositingInputsUpdate); return m_rareAncestorDependentCompositingInputs ? m_rareAncestorDependentCompositingInputs->transformAncestor : nullptr; }
const PaintLayer* filterAncestor() const { ASSERT(!m_needsAncestorDependentCompositingInputsUpdate); return m_rareAncestorDependentCompositingInputs ? m_rareAncestorDependentCompositingInputs->filterAncestor : nullptr; }
const LayoutObject* clippingContainer() const { ASSERT(!m_needsAncestorDependentCompositingInputsUpdate); return m_ancestorDependentCompositingInputs.clippingContainer; }
+ const PaintLayer* ancestorOverflowLayer() const { return m_ancestorOverflowLayer; }
const PaintLayer* ancestorScrollingLayer() const { ASSERT(!m_needsAncestorDependentCompositingInputsUpdate); return m_rareAncestorDependentCompositingInputs ? m_rareAncestorDependentCompositingInputs->ancestorScrollingLayer : nullptr; }
const PaintLayer* nearestFixedPositionLayer() const { ASSERT(!m_needsAncestorDependentCompositingInputsUpdate); return m_rareAncestorDependentCompositingInputs ? m_rareAncestorDependentCompositingInputs->nearestFixedPositionLayer : nullptr; }
const PaintLayer* scrollParent() const { ASSERT(!m_needsAncestorDependentCompositingInputsUpdate); return m_rareAncestorDependentCompositingInputs ? m_rareAncestorDependentCompositingInputs->scrollParent : nullptr; }
@@ -691,9 +699,6 @@ private:
void dirtyAncestorChainHasSelfPaintingLayerDescendantStatus();
- // Returns true if the position changed.
- bool updateLayerPosition();
-
void updateLayerPositionRecursive();
void updateLayerPositionsAfterScrollRecursive(const DoubleSize& scrollDelta, bool paintInvalidationContainerWasScrolled);
@@ -848,6 +853,9 @@ private:
LayoutUnit m_staticInlinePosition;
LayoutUnit m_staticBlockPosition;
+ // The first ancestor having a non visible overflow.
+ const PaintLayer* m_ancestorOverflowLayer;
+
AncestorDependentCompositingInputs m_ancestorDependentCompositingInputs;
OwnPtr<RareAncestorDependentCompositingInputs> m_rareAncestorDependentCompositingInputs;

Powered by Google App Engine
This is Rietveld 408576698