Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Unified Diff: ui/gfx/compositor/compositor_cc.h

Issue 8873001: Revert 113470 - Makes tests either use mock compositor or mock WebGraphicsContext3D depending upo... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 | « ui/gfx/compositor/compositor.gyp ('k') | ui/gfx/compositor/compositor_cc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/compositor_cc.h
===================================================================
--- ui/gfx/compositor/compositor_cc.h (revision 113506)
+++ ui/gfx/compositor/compositor_cc.h (working copy)
@@ -90,6 +90,10 @@
static void Initialize(bool useThread);
static void Terminate();
+ // If necessary enables the test context. If the test context is enabled the
+ // compositor does not render anything to screen.
+ static void EnableTestContextIfNecessary();
+
protected:
// Compositor implementation.
virtual Texture* CreateTexture() OVERRIDE;
@@ -119,6 +123,9 @@
WebKit::WebLayer root_web_layer_;
WebKit::WebLayerTreeView host_;
+ // See description above SetTestContextEnabled.
+ static bool test_context_enabled_;
+
DISALLOW_COPY_AND_ASSIGN(CompositorCC);
};
« no previous file with comments | « ui/gfx/compositor/compositor.gyp ('k') | ui/gfx/compositor/compositor_cc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698