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 0c09203bddc71e3414b1e74104b148d17b437b95..e4c60725b8f6cf7008dd831328b0b066218c8ebc 100644 |
--- a/third_party/WebKit/Source/core/paint/PaintLayer.h |
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.h |
@@ -591,7 +591,7 @@ public: |
void updateAncestorOverflowLayer(const PaintLayer* ancestorOverflowLayer) { m_ancestorOverflowLayer = ancestorOverflowLayer; } |
void updateAncestorDependentCompositingInputs(const AncestorDependentCompositingInputs&, const RareAncestorDependentCompositingInputs&, bool hasAncestorWithClipPath); |
- void updateDescendantDependentCompositingInputs(bool hasDescendantWithClipPath, bool hasNonIsolatedDescendantWithBlendMode); |
+ void updateDescendantDependentCompositingInputs(bool hasDescendantWithClipPath, bool hasNonIsolatedDescendantWithBlendMode, bool hasRootScrollerAsDescendant); |
void didUpdateCompositingInputs(); |
IntRect clippedAbsoluteBoundingBox() const { ASSERT(!m_needsAncestorDependentCompositingInputsUpdate); return m_ancestorDependentCompositingInputs.clippedAbsoluteBoundingBox; } |
@@ -608,6 +608,8 @@ public: |
bool hasDescendantWithClipPath() const { ASSERT(!m_needsDescendantDependentCompositingInputsUpdate); return m_hasDescendantWithClipPath; } |
bool hasNonIsolatedDescendantWithBlendMode() const; |
+ bool hasRootScrollerAsDescendant() const { ASSERT(!m_needsDescendantDependentCompositingInputsUpdate); return m_hasRootScrollerAsDescendant; } |
+ |
bool lostGroupedMapping() const { ASSERT(isAllowedToQueryCompositingState()); return m_lostGroupedMapping; } |
void setLostGroupedMapping(bool b) { m_lostGroupedMapping = b; } |
@@ -887,6 +889,7 @@ private: |
unsigned m_hasDescendantWithClipPath : 1; |
unsigned m_hasNonIsolatedDescendantWithBlendMode : 1; |
unsigned m_hasAncestorWithClipPath : 1; |
+ unsigned m_hasRootScrollerAsDescendant : 1; |
LayoutBoxModelObject* m_layoutObject; |