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

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

Issue 1841643004: paintInvalidationContainerSkipped/containerSkipped => ancestorSkipped (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also update some comments 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 215e0e023d6fafa9a0c9ee9a6dcd8b491c6ca25b..a796b525c46143b1bc07d035fec821749c9c065b 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -1960,8 +1960,8 @@ bool LayoutBox::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ance
return true;
}
- bool containerSkipped;
- LayoutObject* container = this->container(ancestor, &containerSkipped);
+ bool ancestorSkipped;
+ LayoutObject* container = this->container(ancestor, &ancestorSkipped);
if (!container)
return true;
@@ -1999,11 +1999,11 @@ bool LayoutBox::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ance
return false;
}
- if (containerSkipped) {
- // If the paintInvalidationContainer is below o, then we need to map the rect into paintInvalidationContainer's coordinates.
+ if (ancestorSkipped) {
+ // If the ancestor is below o, then we need to map the rect into paintInvalidationContainer's coordinates.
LayoutSize containerOffset = ancestor->offsetFromAncestorContainer(container);
rect.move(-containerOffset);
- // If the paintInvalidationContainer is fixed, then the rect is already in its coordinates so doesn't need viewport-adjusting.
+ // If the ancestor is fixed, then the rect is already in its coordinates so doesn't need viewport-adjusting.
if (ancestor->style()->position() != FixedPosition && container->isLayoutView() && position == FixedPosition)
toLayoutView(container)->adjustOffsetForFixedPosition(rect);
return true;
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698