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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutView.cpp

Issue 1818963003: Pass nullptr for paintInvalidationState if it can't be used to map geometry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/layout/LayoutView.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutView.cpp b/third_party/WebKit/Source/core/layout/LayoutView.cpp
index f1ecdfa63692fe8c7e2134668be174c57723f868..2e243242c277b07bfecacaeefadd0c68c8622202 100644
--- a/third_party/WebKit/Source/core/layout/LayoutView.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutView.cpp
@@ -480,11 +480,14 @@ void LayoutView::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* anc
mapToVisibleRectInAncestorSpace(ancestor, rect, IsNotFixedPosition, invalidationState);
}
-void LayoutView::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect& rect, ViewportConstrainedPosition viewportConstraint, const PaintInvalidationState* state) const
+void LayoutView::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect& rect, ViewportConstrainedPosition viewportConstraint,
+ const PaintInvalidationState* paintInvalidationState) const
{
if (document().printing())
return;
+ // TODO(chrishtr): fix PaintInvalidationState offsets for LayoutViews.
+
if (style()->isFlippedBlocksWritingMode()) {
// We have to flip by hand since the view's logical height has not been determined. We
// can use the viewport width and height.
@@ -509,7 +512,7 @@ void LayoutView::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* anc
return;
if (LayoutBox* obj = owner->layoutBox()) {
- if (!state || !state->viewClippingAndScrollOffsetDisabled()) {
+ if (!paintInvalidationState || !paintInvalidationState->viewClippingAndScrollOffsetDisabled()) {
// Intersect the viewport with the paint invalidation rect.
LayoutRect viewRectangle = viewRect();
rect.intersect(viewRectangle);

Powered by Google App Engine
This is Rietveld 408576698