Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp - Issue 6901134: Merge 84546 - 2011-04-21 Nat Duca <nduca@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/LayerRendererChromium.cpp

Issue 6901134: Merge 84546 - 2011-04-21 Nat Duca <nduca@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/

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

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

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

--- Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp (revision 85349)

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

@@ -1005,6 +1005,7 @@

m_sharedGeometry = adoptPtr(new GeometryBinding(m_context.get()));

m_borderProgram = adoptPtr(new LayerChromium::BorderProgram(m_context.get()));

+ m_headsUpDisplayProgram = adoptPtr(new CCHeadsUpDisplay::Program(m_context.get()));

m_canvasLayerProgram = adoptPtr(new CCCanvasLayerImpl::Program(m_context.get()));

m_videoLayerRGBAProgram = adoptPtr(new CCVideoLayerImpl::RGBAProgram(m_context.get()));

m_videoLayerYUVProgram = adoptPtr(new CCVideoLayerImpl::YUVProgram(m_context.get()));

@@ -1015,6 +1016,7 @@

if (!m_sharedGeometry->initialized() || !m_borderProgram->initialized()

|| !m_canvasLayerProgram->initialized()

+ || !m_headsUpDisplayProgram->initialized()

|| !m_videoLayerRGBAProgram->initialized() || !m_videoLayerYUVProgram->initialized()

|| !m_pluginLayerProgram->initialized() || !m_renderSurfaceProgram->initialized()

|| !m_renderSurfaceMaskProgram->initialized() || !m_tilerProgram->initialized()) {

@@ -1034,6 +1036,7 @@

m_sharedGeometry.clear();

m_borderProgram.clear();

m_canvasLayerProgram.clear();

+ m_headsUpDisplayProgram.clear();

m_videoLayerRGBAProgram.clear();

m_videoLayerYUVProgram.clear();

m_pluginLayerProgram.clear();