Source/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp - Issue 7046081: Merge 88496 - 2011-06-09 James Robinson <jamesr@chromium.org>

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/platform/graphics/chromium/RenderSurfaceChromium.cpp

Issue 7046081: Merge 88496 - 2011-06-09 James Robinson <jamesr@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/

Patch Set: Created 9 years, 6 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 | « Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp ('k') | Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp

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

--- Source/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp (revision 88498)

+++ Source/WebCore/platform/graphics/chromium/RenderSurfaceChromium.cpp (working copy)

@@ -152,8 +152,12 @@

if (!m_maskLayer && m_owningLayer->replicaLayer())

replicaMaskLayer = m_owningLayer->replicaLayer()->maskLayer();

- layerRenderer()->setScissorToRect(m_scissorRect);

+ if (m_owningLayer->parent() && m_owningLayer->parent()->usesLayerScissor())

+ layerRenderer()->setScissorToRect(m_scissorRect);

+ else

+ GLC(layerRenderer()->context(), layerRenderer()->context()->disable(GraphicsContext3D::SCISSOR_TEST));

// Reflection draws before the layer.

if (m_owningLayer->replicaLayer())

drawSurface(replicaMaskLayer, m_replicaDrawTransform);