Source/core/page/scrolling/ScrollingCoordinator.cpp - Issue 129813009: Fix RenderGeometryMap ASSERT in touch hit rect computation

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: Source/core/page/scrolling/ScrollingCoordinator.cpp

Issue 129813009: Fix RenderGeometryMap ASSERT in touch hit rect computation (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 11 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

« LayoutTests/fast/events/touch/touch-rect-assert-first-layer-special.html ('K') | « LayoutTests/fast/events/touch/touch-rect-assert-first-layer-special.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/page/scrolling/ScrollingCoordinator.cpp

diff --git a/Source/core/page/scrolling/ScrollingCoordinator.cpp b/Source/core/page/scrolling/ScrollingCoordinator.cpp

index 0c078331c2d9287e3f5eff978a2183e92a6e74a2..bfb1ae1d44a1dd29fb94b0e039351aa346de4715 100644

--- a/Source/core/page/scrolling/ScrollingCoordinator.cpp

+++ b/Source/core/page/scrolling/ScrollingCoordinator.cpp

@@ -504,10 +504,12 @@ static void convertLayerRectsToEnclosingCompositedLayer(Frame* mainFrame, const

MapCoordinatesFlags flags = UseTransforms;

if (touchHandlerInChildFrame)

flags |= TraverseDocumentBoundaries;

+ RenderLayer* rootLayer = mainFrame->contentRenderer()->layer();

RenderGeometryMap geometryMap(flags);

+ geometryMap.pushMappingsToAncestor(rootLayer, 0);

LayerFrameMap layerChildFrameMap;

makeLayerChildFrameMap(mainFrame, &layerChildFrameMap);

- convertLayerRectsToEnclosingCompositedLayerRecursive(mainFrame->contentRenderer()->layer(), layerRects, compositorRects, geometryMap, layersWithRects, layerChildFrameMap);

+ convertLayerRectsToEnclosingCompositedLayerRecursive(rootLayer, layerRects, compositorRects, geometryMap, layersWithRects, layerChildFrameMap);

}

void ScrollingCoordinator::updateTouchEventTargetRectsIfNeeded()