webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc - Issue 470973002: gpu: Remove WebGraphicsContext3D::makeContextCurrent()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc

Issue 470973002: gpu: Remove WebGraphicsContext3D::makeContextCurrent() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use scoped_ptr and remove unrelated changes. Created 6 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

« content/renderer/renderer_webkitplatformsupport_impl.cc ('K') | « webkit/common/gpu/grcontext_for_webgraphicscontext3d.h ('k') | webkit/common/gpu/webgraphicscontext3d_impl.h » ('j') | webkit/common/gpu/webgraphicscontext3d_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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());

}

GrContextForWebGraphicsContext3D::GrContextForWebGraphicsContext3D(

- blink::WebGraphicsContext3D* context3d) {

+ WebGraphicsContext3DImpl* context3d) {

if (!context3d)

return;

+ gles2::SetGLContext(context3d->GetGLInterface());

skia::RefPtr<GrGLInterface> interface = skia::AdoptRef(

context3d->createGrGLInterface());

if (!interface)