third_party/WebKit/Source/modules/webgl/WebGLShader.cpp - Issue 1815803003: Move simple methods [T-Z] from WebGraphicsContext3D to GLES2Interface.

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: third_party/WebKit/Source/modules/webgl/WebGLShader.cpp

Issue 1815803003: Move simple methods [T-Z] from WebGraphicsContext3D to GLES2Interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simples-fplus

Patch Set: simples-tplus: fixed Created 4 years, 9 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 | « third_party/WebKit/Source/modules/webgl/WebGLShader.h ('k') | third_party/WebKit/Source/modules/webgl/WebGLSharedObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webgl/WebGLShader.cpp

diff --git a/third_party/WebKit/Source/modules/webgl/WebGLShader.cpp b/third_party/WebKit/Source/modules/webgl/WebGLShader.cpp

index da1a71fe140721de547e0429f723f3dc0d2fa5c1..509274be12cef76ef3e07d765a67c86088d82cf9 100644

--- a/third_party/WebKit/Source/modules/webgl/WebGLShader.cpp

+++ b/third_party/WebKit/Source/modules/webgl/WebGLShader.cpp

@@ -25,6 +25,7 @@

#include "modules/webgl/WebGLShader.h"

+#include "gpu/command_buffer/client/gles2_interface.h"

#include "modules/webgl/WebGLRenderingContextBase.h"

namespace blink {

@@ -39,7 +40,7 @@ WebGLShader::WebGLShader(WebGLRenderingContextBase* ctx, GLenum type)

, m_type(type)

, m_source("")

{

- setObject(ctx->webContext()->createShader(type));

+ setObject(ctx->contextGL()->CreateShader(type));

}

WebGLShader::~WebGLShader()

@@ -48,9 +49,9 @@ WebGLShader::~WebGLShader()

detachAndDeleteObject();

}

-void WebGLShader::deleteObjectImpl(WebGraphicsContext3D* context3d)

+void WebGLShader::deleteObjectImpl(WebGraphicsContext3D* context3d, gpu::gles2::GLES2Interface* gl)

{

- context3d->deleteShader(m_object);

+ gl->DeleteShader(m_object);

m_object = 0;

}