| 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 ccb457742376b6f94f3383fbf753d21ff1483e1b..aca1a7a121d97841c8618cf58db8111832a191c8 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintLayer.h
|
| +++ b/third_party/WebKit/Source/core/paint/PaintLayer.h
|
| @@ -220,6 +220,7 @@ public:
|
| void contentChanged(ContentChangeType);
|
|
|
| void updateLayerPositionsAfterLayout();
|
| + void updateLayerPositionAfterFrameScroll(const DoubleSize& scrollDelta);
|
| void updateLayerPositionsAfterOverflowScroll(const DoubleSize& scrollDelta);
|
|
|
| PaintLayer* enclosingPaginationLayer() const { return m_enclosingPaginationLayer; }
|
| @@ -540,7 +541,13 @@ public:
|
| void updateDescendantDependentCompositingInputs(const DescendantDependentCompositingInputs&);
|
| void didUpdateCompositingInputs();
|
|
|
| - const AncestorDependentCompositingInputs& ancestorDependentCompositingInputs() const { ASSERT(!m_needsAncestorDependentCompositingInputsUpdate); return m_ancestorDependentCompositingInputs; }
|
| + const AncestorDependentCompositingInputs& ancestorDependentCompositingInputs() const
|
| + {
|
| + // TODO(flackr): When we process scroll updates after compositing updates we won't be querying ancestor
|
| + // dependent compositing inputs while they're still needed: http://crbug.com/420741.
|
| + ASSERT(isAllowedToQueryCompositingState() || !m_needsAncestorDependentCompositingInputsUpdate);
|
| + return m_ancestorDependentCompositingInputs;
|
| + }
|
| const DescendantDependentCompositingInputs& descendantDependentCompositingInputs() const { ASSERT(!m_needsDescendantDependentCompositingInputsUpdate); return m_descendantDependentCompositingInputs; }
|
|
|
| IntRect clippedAbsoluteBoundingBox() const { return ancestorDependentCompositingInputs().clippedAbsoluteBoundingBox; }
|
|
|