Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.cpp - Issue 7671031: Merge 92520 - [chromium] Accelerated canvas breaks when moving canvases or resources between Pages

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

Issue 7671031: Merge 92520 - [chromium] Accelerated canvas breaks when moving canvases or resources between Pages (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

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

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

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

--- Source/WebCore/platform/graphics/chromium/CanvasLayerChromium.cpp (revision 93254)

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

@@ -42,8 +42,6 @@

CanvasLayerChromium::CanvasLayerChromium(GraphicsLayerChromium* owner)

: LayerChromium(owner)

- , m_textureChanged(true)

- , m_textureId(0)

, m_hasAlpha(true)

, m_premultipliedAlpha(true)

{

@@ -63,7 +61,7 @@

LayerChromium::pushPropertiesTo(layer);

CCCanvasLayerImpl* canvasLayer = static_cast<CCCanvasLayerImpl*>(layer);

- canvasLayer->setTextureId(m_textureId);

+ canvasLayer->setTextureId(textureId());

canvasLayer->setHasAlpha(m_hasAlpha);

canvasLayer->setPremultipliedAlpha(m_premultipliedAlpha);

}