Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h - 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/LayerRendererChromium.h

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.cpp ('k') | Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

--- Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h (revision 89959)

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

@@ -148,6 +148,9 @@

void addChildContext(GraphicsContext3D*);

void removeChildContext(GraphicsContext3D*);

+ // Return true if the compositor context has an error.

+ bool isCompositorContextLost();

#ifndef NDEBUG

static bool s_inPaintLayerContents;

#endif

@@ -238,11 +241,6 @@

#endif

ChildContextMap m_childContexts;

- // If true, the child contexts were copied to the compositor texture targets

- // and the compositor will need to wait on the proper latches before using

- // the target textures. If false, the compositor is reusing the textures

- // from last frame.

- bool m_childContextsWereCopied;

bool m_contextSupportsLatch;

bool m_contextSupportsMapSub;