third_party/WebKit/Source/core/frame/FrameView.cpp - Issue 1813383002: Move all fast-path paint invalidation mapping into PaintInvalidationState

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.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

« no previous file with comments | « third_party/WebKit/Source/core/dom/IntersectionObservation.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/FrameView.cpp

diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp

index c0226c98d7ccadbd7a1d6061e9ed5337804b914e..663f5a15cb97403ec1ae4300e0952cfd6f0e85e6 100644

--- a/third_party/WebKit/Source/core/frame/FrameView.cpp

+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp

@@ -1099,14 +1099,11 @@ void FrameView::invalidateTreeIfNeeded(PaintInvalidationState& paintInvalidation

rootForPaintInvalidation.invalidateTreeIfNeeded(paintInvalidationState);

- if (!m_frame->settings() || !m_frame->settings()->rootLayerScrolls()) {

- paintInvalidationState.setViewClippingAndScrollOffsetDisabled(true);

+ if (!m_frame->settings() || !m_frame->settings()->rootLayerScrolls())

invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState);

- paintInvalidationState.setViewClippingAndScrollOffsetDisabled(false);

- }

#if ENABLE(ASSERT)

- layoutView()->assertSubtreeClearedPaintInvalidationState();

+ layoutView()->assertSubtreeClearedPaintInvalidationFlags();

#endif

if (m_frame->selection().isCaretBoundsDirty())

@@ -2114,7 +2111,7 @@ IntRect FrameView::windowClipRect(IncludeScrollbarsInRect scrollbarInclusion) co

ASSERT(m_frame->view() == this);

LayoutRect clipRect(LayoutPoint(), LayoutSize(visibleContentSize(scrollbarInclusion)));

- layoutView()->mapToVisibleRectInAncestorSpace(&layoutView()->containerForPaintInvalidation(), clipRect, nullptr);

+ layoutView()->mapToVisibleRectInAncestorSpace(&layoutView()->containerForPaintInvalidation(), clipRect);

return enclosingIntRect(clipRect);

}

@@ -3972,7 +3969,7 @@ void FrameView::collectFrameTimingRequests(GraphicsLayerFrameTimingRequests& gra

if (!graphicsLayer)

return;

- PaintLayer::mapRectToPaintInvalidationBacking(localFrame->contentLayoutObject(), &paintInvalidationContainer, viewRect);

+ PaintLayer::mapRectToPaintInvalidationBacking(*localFrame->contentLayoutObject(), paintInvalidationContainer, viewRect);

graphicsLayerTimingRequests.add(graphicsLayer, Vector<std::pair<int64_t, WebRect>>()).storedValue->value.append(std::make_pair(m_frame->frameID(), enclosingIntRect(viewRect)));

}