Source/WebCore/rendering/RenderLayerCompositor.cpp - Issue 12797016: Merge 144642 "Don't apply page scale to clipRect if applyPageSca..."

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/RenderLayerCompositor.cpp

Issue 12797016: Merge 144642 "Don't apply page scale to clipRect if applyPageSca..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 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: Source/WebCore/rendering/RenderLayerCompositor.cpp

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

--- Source/WebCore/rendering/RenderLayerCompositor.cpp (revision 146647)

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

@@ -768,7 +768,9 @@

}

IntRect clipRect = pixelSnappedIntRect(layer->backgroundClipRect(RenderLayer::ClipRectsContext(rootRenderLayer(), 0, AbsoluteClipRects)).rect()); // FIXME: Incorrect for CSS regions.

- clipRect.scale(pageScaleFactor());

+ if (Settings* settings = m_renderView->document()->settings())

+ if (!settings->applyPageScaleFactorInCompositor())

+ clipRect.scale(pageScaleFactor());

clipRect.intersect(layerBounds);

overlapMap.add(layer, clipRect);

}

« no previous file with comments | « no previous file | no next file » | no next file with comments »