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

Unified Diff: content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h

Issue 7685001: Don't call RenderView directly if USE_THREADED_COMPOSITOR is set. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Added missing #ifdef 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 | « no previous file | content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h
===================================================================
--- content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h (revision 97492)
+++ content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h (working copy)
@@ -440,8 +440,11 @@
// The GLES2Implementation we use for OpenGL rendering.
gpu::gles2::GLES2Implementation* gl_;
+ bool render_directly_to_web_view_;
+#ifndef WTF_USE_THREADED_COMPOSITING
// If rendering directly to WebView, weak pointer to it.
WebKit::WebView* web_view_;
+#endif
#if defined(OS_MACOSX)
// "Fake" plugin window handle in browser process for the compositor's output.
gfx::PluginWindowHandle plugin_handle_;
« no previous file with comments | « no previous file | content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698