Source/WebCore/rendering/RenderLayer.cpp - Issue 9599025: Merge 109060 - RenderLayer ClipRect not accounting for transforms

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/WebCore/rendering/RenderLayer.cpp

Issue 9599025: Merge 109060 - RenderLayer ClipRect not accounting for transforms (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/

Patch Set: Created 8 years, 10 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 | « LayoutTests/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt ('k') | Source/WebCore/rendering/RenderObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/rendering/RenderLayer.cpp

===================================================================

--- Source/WebCore/rendering/RenderLayer.cpp (revision 109792)

+++ Source/WebCore/rendering/RenderLayer.cpp (working copy)

@@ -3637,8 +3637,12 @@

// Update the clip rects that will be passed to child layers.

if (renderer()->hasOverflowClip() || renderer()->hasClip()) {

// This layer establishes a clip of some kind.

+ // This offset cannot use convertToLayerCoords, because sometimes our rootLayer may be across

+ // some transformed layer boundary, for example, in the RenderLayerCompositor overlapMap, where

+ // clipRects are needed in view space.

LayoutPoint offset;

- convertToLayerCoords(rootLayer, offset);

+ offset = roundedIntPoint(renderer()->localToContainerPoint(FloatPoint(), rootLayer->renderer()));

RenderView* view = renderer()->view();

ASSERT(view);

if (view && clipRects.fixed() && rootLayer->renderer() == view) {