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

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

Issue 7554015: Implemented support for GL constext share groups in the renderer process. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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
Index: content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
===================================================================
--- content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc (revision 95161)
+++ content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc (working copy)
@@ -13,7 +13,9 @@
#include <GLES2/gl2ext.h>
#include <algorithm>
+#include <set>
+#include "base/lazy_instance.h"
#include "base/string_tokenizer.h"
#include "base/command_line.h"
#include "base/debug/trace_event.h"
@@ -30,6 +32,9 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "webkit/glue/gl_bindings_skia_cmd_buffer.h"
+static base::LazyInstance<std::set<WebGraphicsContext3DCommandBufferImpl*> >
+ g_all_contexts(base::LINKER_INITIALIZED);
+
WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl()
: context_(NULL),
gl_(NULL),
@@ -47,6 +52,7 @@
WebGraphicsContext3DCommandBufferImpl::
~WebGraphicsContext3DCommandBufferImpl() {
+ g_all_contexts.Pointer()->erase(this);
delete context_;
}
@@ -107,6 +113,16 @@
if (web_view && web_view->mainFrame())
active_url = GURL(web_view->mainFrame()->document().url());
+ // HACK: Assume this is a WebGL context by looking for the noExtensions
+ // attribute. WebGL contexts must not go in the share group because they
+ // rely on destruction of the context to clean up owned resources. Putting
+ // them in a share group would prevent this from happening.
+ RendererGLContext* share_group = NULL;
+ if (!attributes.noExtensions) {
+ share_group = g_all_contexts.Pointer()->empty() ?
+ NULL : (*g_all_contexts.Pointer()->begin())->context_;
+ }
+
if (render_directly_to_web_view) {
RenderView* renderview = RenderView::FromWebView(web_view);
if (!renderview)
@@ -116,6 +132,7 @@
context_ = RendererGLContext::CreateViewContext(
host,
renderview->routing_id(),
+ share_group,
preferred_extensions,
attribs,
active_url);
@@ -128,6 +145,7 @@
context_ = RendererGLContext::CreateOffscreenContext(
host,
gfx::Size(1, 1),
+ share_group,
preferred_extensions,
attribs,
active_url);
@@ -164,6 +182,9 @@
attributes_.antialias = samples > 0;
}
+ if (!attributes.noExtensions)
+ g_all_contexts.Pointer()->insert(this);
+
return true;
}

Powered by Google App Engine
This is Rietveld 408576698