third_party/WebKit/Source/modules/webgl/WebGLTimerQueryEXT.cpp - Issue 1808403002: Move simple methods [F-S] 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/WebGLTimerQueryEXT.cpp

Issue 1808403002: Move simple methods [F-S] from WebGraphicsContext3D to GLES2Interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bindFoo

Patch Set: simples-fplus: tests 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/WebGLTimerQueryEXT.h ('k') | third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridge.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e4518f11d3004f9b0fc04784cede656a1885951c..7e1fae17dba31d621822c371fccbb28a417c64aa 100644

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

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

@@ -4,6 +4,7 @@

#include "modules/webgl/WebGLTimerQueryEXT.h"

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

#include "modules/webgl/WebGLRenderingContextBase.h"

#include "public/platform/Platform.h"

@@ -45,7 +46,7 @@ void WebGLTimerQueryEXT::resetCachedResult()

registerTaskObserver();

}

-void WebGLTimerQueryEXT::updateCachedResult(WebGraphicsContext3D* ctx)

+void WebGLTimerQueryEXT::updateCachedResult(gpu::gles2::GLES2Interface* gl)

{

if (m_queryResultAvailable)

return;

@@ -59,11 +60,11 @@ void WebGLTimerQueryEXT::updateCachedResult(WebGraphicsContext3D* ctx)

// We can only update the cached result when control returns to the browser.

m_canUpdateAvailability = false;

GLuint available = 0;

- ctx->getQueryObjectuivEXT(object(), GL_QUERY_RESULT_AVAILABLE_EXT, &available);

+ gl->GetQueryObjectuivEXT(object(), GL_QUERY_RESULT_AVAILABLE_EXT, &available);

m_queryResultAvailable = !!available;

if (m_queryResultAvailable) {

GLuint64 result = 0;

- ctx->getQueryObjectui64vEXT(object(), GL_QUERY_RESULT_EXT, &result);

+ gl->GetQueryObjectui64vEXT(object(), GL_QUERY_RESULT_EXT, &result);

m_queryResult = result;

unregisterTaskObserver();

}