Chromium Code Reviews| Index: webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc |
| diff --git a/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc b/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc |
| index 5c7bc39ec3a68288b4b2f509e57c939028d09fb7..1566d9500b83400aa7e0e42241d0f8fdc3ff429a 100644 |
| --- a/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc |
| +++ b/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc |
| @@ -5,24 +5,26 @@ |
| #include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h" |
| #include "base/debug/trace_event.h" |
| -#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" |
| +#include "gpu/command_buffer/client/gles2_lib.h" |
| #include "third_party/skia/include/gpu/GrContext.h" |
| #include "third_party/skia/include/gpu/gl/GrGLInterface.h" |
| +#include "webkit/common/gpu/webgraphicscontext3d_impl.h" |
| namespace webkit { |
| namespace gpu { |
| static void BindWebGraphicsContext3DGLContextCallback( |
| const GrGLInterface* interface) { |
| - reinterpret_cast<blink::WebGraphicsContext3D*>( |
| - interface->fCallbackData)->makeContextCurrent(); |
| + gles2::SetGLContext(reinterpret_cast<WebGraphicsContext3DImpl*>( |
| + interface->fCallbackData)->GetGLInterface()); |
|
dshwang
2014/08/15 14:54:01
Now this file is only client that uses gles2::SetG
|
| } |
| GrContextForWebGraphicsContext3D::GrContextForWebGraphicsContext3D( |
| - blink::WebGraphicsContext3D* context3d) { |
| + WebGraphicsContext3DImpl* context3d) { |
| if (!context3d) |
| return; |
| + gles2::SetGLContext(context3d->GetGLInterface()); |
| skia::RefPtr<GrGLInterface> interface = skia::AdoptRef( |
| context3d->createGrGLInterface()); |
| if (!interface) |