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

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

Issue 1813383002: Move all fast-path paint invalidation mapping into PaintInvalidationState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable fast-path/slow-path comparison because of saturated operations of LayoutUnit 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/LayoutInline.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutInline.cpp b/third_party/WebKit/Source/core/layout/LayoutInline.cpp
index c3104523b7d629a71a5a5407d3d1a790c58d41b8..4329025d48a1a347a8f0505a1ded7ff44f893d2e 100644
--- a/third_party/WebKit/Source/core/layout/LayoutInline.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutInline.cpp
@@ -1023,7 +1023,7 @@ LayoutRect LayoutInline::absoluteClippedOverflowRect() const
{
if (!continuation()) {
LayoutRect rect = visualOverflowRect();
- mapToVisibleRectInAncestorSpace(view(), rect, nullptr);
+ mapToVisibleRectInAncestorSpace(view(), rect);
return rect;
}
@@ -1040,7 +1040,7 @@ LayoutRect LayoutInline::absoluteClippedOverflowRect() const
context(FloatRect(rect));
if (curr == endContinuation) {
LayoutRect rect(enclosingIntRect(floatResult));
- mapToVisibleRectInAncestorSpace(view(), rect, nullptr);
+ mapToVisibleRectInAncestorSpace(view(), rect);
return rect;
}
}
@@ -1078,11 +1078,8 @@ LayoutRect LayoutInline::visualOverflowRect() const
return overflowRect;
}
-bool LayoutInline::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect& rect, const PaintInvalidationState* paintInvalidationState, VisibleRectFlags visibleRectFlags) const
+bool LayoutInline::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect& rect, VisibleRectFlags visibleRectFlags) const
{
- if (paintInvalidationState && paintInvalidationState->canMapToAncestor(ancestor))
- return paintInvalidationState->mapObjectRectToAncestor(*this, ancestor, rect, visibleRectFlags);
-
if (ancestor == this)
return true;
@@ -1118,7 +1115,7 @@ bool LayoutInline::mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* a
return true;
}
- return container->mapToVisibleRectInAncestorSpace(ancestor, rect, nullptr, visibleRectFlags);
+ return container->mapToVisibleRectInAncestorSpace(ancestor, rect, visibleRectFlags);
}
LayoutSize LayoutInline::offsetFromContainer(const LayoutObject* container) const

Powered by Google App Engine
This is Rietveld 408576698