Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp - Issue 7274032: Merge 89635 - 2011-06-23 John Bates <jbates@google.com>

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

Issue 7274032: Merge 89635 - 2011-06-23 John Bates <jbates@google.com> (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/Canvas2DLayerChromium.h ('k') | Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

--- Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.cpp (revision 89959)

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

@@ -35,6 +35,7 @@

#include "Canvas2DLayerChromium.h"

#include "DrawingBuffer.h"

+#include "Extensions3DChromium.h"

#include "GraphicsContext3D.h"

#include "LayerRendererChromium.h"

@@ -59,9 +60,17 @@

layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D().get());

}

+bool Canvas2DLayerChromium::drawsContent() const

+ GraphicsContext3D* context;

+ return (m_drawingBuffer

+ && (context = m_drawingBuffer->graphicsContext3D().get())

+ && (context->getExtensions()->getGraphicsResetStatusARB() == GraphicsContext3D::NO_ERROR));

void Canvas2DLayerChromium::updateCompositorResources()

{

- if (!m_contentsDirty || !m_drawingBuffer)

+ if (!m_contentsDirty || !drawsContent())

return;

if (m_textureChanged) { // We have to generate a new backing texture.

GraphicsContext3D* context = layerRendererContext();