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

Unified Diff: ui/gfx/gl/gl_bindings_skia_in_process.cc

Issue 7753035: Allow each WGC3D subclass to determine the correct GrGLInterface for its GrContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | « ui/gfx/gl/gl_bindings_skia_in_process.h ('k') | webkit/glue/gl_bindings_skia_cmd_buffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gl/gl_bindings_skia_in_process.cc
===================================================================
--- ui/gfx/gl/gl_bindings_skia_in_process.cc (revision 98420)
+++ ui/gfx/gl/gl_bindings_skia_in_process.cc (working copy)
@@ -469,14 +469,14 @@
namespace gfx {
-void BindSkiaToInProcessGL() {
+GrGLInterface* GetInProcessSkiaGLBinding() {
static SkAutoTUnref<GrGLInterface> host_gl_interface;
if (NULL == host_gl_interface.get()) {
GrGLBinding binding;
switch (gfx::GetGLImplementation()) {
case gfx::kGLImplementationNone:
NOTREACHED();
- return;
+ return NULL;
case gfx::kGLImplementationDesktopGL:
binding = kDesktop_GrGLBinding;
break;
@@ -488,10 +488,10 @@
break;
case gfx::kGLImplementationMockGL:
NOTREACHED();
- return;
+ return NULL;
default:
NOTREACHED();
- return;
+ return NULL;
}
GrGLInterface* interface = new GrGLInterface;
@@ -602,7 +602,7 @@
interface->fBindFragDataLocationIndexed =
StubBindFragDataLocationIndexedARB;
}
- GrGLSetDefaultGLInterface(host_gl_interface.get());
+ return host_gl_interface.get();
}
} // namespace gfx
« no previous file with comments | « ui/gfx/gl/gl_bindings_skia_in_process.h ('k') | webkit/glue/gl_bindings_skia_cmd_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698