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

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

Issue 1812243003: Remove methods from WebGraphicsContext3D that wrap type casts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simples-tplus
Patch Set: complex-casts: rebase 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 | « gpu/blink/webgraphicscontext3d_impl.cc ('k') | third_party/WebKit/Source/modules/webgl/WebGLFenceSync.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
index 543953aa053b03b8e643531067b10e77faf489f3..4404ca524ebc598a50d36804d554c5bf163cd3b9 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
@@ -33,9 +33,9 @@ namespace blink {
namespace {
-WGC3Dsync syncObjectOrZero(const WebGLSync* object)
+GLsync syncObjectOrZero(const WebGLSync* object)
{
- return object ? object->object() : 0;
+ return object ? object->object() : nullptr;
}
} // namespace
@@ -253,7 +253,7 @@ void WebGL2RenderingContextBase::blitFramebuffer(GLint srcX0, GLint srcY0, GLint
if (isContextLost())
return;
- webContext()->blitFramebufferCHROMIUM(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+ contextGL()->BlitFramebufferCHROMIUM(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
}
bool WebGL2RenderingContextBase::validateTexFuncLayer(const char* functionName, GLenum texTarget, GLint layer)
@@ -1522,7 +1522,7 @@ void WebGL2RenderingContextBase::vertexAttribIPointer(GLuint index, GLint size,
}
m_boundVertexArrayObject->setArrayBufferForAttrib(index, m_boundArrayBuffer);
- webContext()->vertexAttribIPointer(index, size, type, stride, static_cast<GLintptr>(offset));
+ contextGL()->VertexAttribIPointer(index, size, type, stride, reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
}
/* Writing to the drawing buffer */
@@ -1575,7 +1575,7 @@ void WebGL2RenderingContextBase::drawRangeElements(GLenum mode, GLuint start, GL
}
clearIfComposited();
- webContext()->drawRangeElements(mode, start, end, count, type, static_cast<GLintptr>(offset));
+ contextGL()->DrawRangeElements(mode, start, end, count, type, reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
markContextChanged(CanvasChanged);
}
@@ -2092,7 +2092,7 @@ GLboolean WebGL2RenderingContextBase::isSync(WebGLSync* sync)
if (isContextLost() || !sync)
return 0;
- return webContext()->isSync(sync->object());
+ return contextGL()->IsSync(sync->object());
}
void WebGL2RenderingContextBase::deleteSync(WebGLSync* sync)
@@ -2111,7 +2111,7 @@ GLenum WebGL2RenderingContextBase::clientWaitSync(WebGLSync* sync, GLbitfield fl
}
GLuint64 timeout64 = timeout == -1 ? GL_TIMEOUT_IGNORED : static_cast<GLuint64>(timeout);
- return webContext()->clientWaitSync(syncObjectOrZero(sync), flags, timeout64);
+ return contextGL()->ClientWaitSync(syncObjectOrZero(sync), flags, timeout64);
}
void WebGL2RenderingContextBase::waitSync(WebGLSync* sync, GLbitfield flags, GLint64 timeout)
@@ -2125,7 +2125,7 @@ void WebGL2RenderingContextBase::waitSync(WebGLSync* sync, GLbitfield flags, GLi
}
GLuint64 timeout64 = timeout == -1 ? GL_TIMEOUT_IGNORED : static_cast<GLuint64>(timeout);
- webContext()->waitSync(syncObjectOrZero(sync), flags, timeout64);
+ contextGL()->WaitSync(syncObjectOrZero(sync), flags, timeout64);
}
ScriptValue WebGL2RenderingContextBase::getSyncParameter(ScriptState* scriptState, WebGLSync* sync, GLenum pname)
@@ -2141,7 +2141,7 @@ ScriptValue WebGL2RenderingContextBase::getSyncParameter(ScriptState* scriptStat
{
GLint value = 0;
GLsizei length = -1;
- webContext()->getSynciv(syncObjectOrZero(sync), pname, 1, &length, &value);
+ contextGL()->GetSynciv(syncObjectOrZero(sync), pname, 1, &length, &value);
return WebGLAny(scriptState, static_cast<unsigned>(value));
}
default:
« no previous file with comments | « gpu/blink/webgraphicscontext3d_impl.cc ('k') | third_party/WebKit/Source/modules/webgl/WebGLFenceSync.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698