diff options
| author | danakj <danakj@chromium.org> | 2016-03-15 22:22:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-16 05:24:09 +0000 |
| commit | cdf8787552cc045c829fb7c6a43973d2452b8f4c (patch) | |
| tree | 171ac7844b7f7a650e7bb7dba7171bacb8add08e /content/common/gpu | |
| parent | 98a214071cb9542f09bf62250c5c7f7637bfa9c5 (diff) | |
| download | chromium_src-cdf8787552cc045c829fb7c6a43973d2452b8f4c.zip chromium_src-cdf8787552cc045c829fb7c6a43973d2452b8f4c.tar.gz chromium_src-cdf8787552cc045c829fb7c6a43973d2452b8f4c.tar.bz2 | |
Expose GLES2Interface to blink, and delete isContextLost() from WGC3D.
This deletes the isContextLost() method from WebGraphicsContext3D, as
an example, and replaces calls to that in blink by called to
GetGraphicsResetStatusKHR() on the GLES2Interface directly.
R=esprehn@chromium.org, kbr@chromium.org, zmo@chromium.org
BUG=584497
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel
Review URL: https://codereview.chromium.org/1790753002
Cr-Commit-Position: refs/heads/master@{#381392}
Diffstat (limited to 'content/common/gpu')
| -rw-r--r-- | content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc index 3a1745f..028e874 100644 --- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc @@ -249,7 +249,7 @@ bool WebGraphicsContext3DCommandBufferImpl::CreateContext() { gles2_helper_.get(), gles2_share_group.get(), transfer_buffer_.get(), bind_generates_resources, lose_context_when_out_of_memory_, support_client_side_arrays, command_buffer_.get())); - setGLInterface(real_gl_.get()); + SetGLInterface(real_gl_.get()); if (!real_gl_->Initialize( mem_limits_.start_transfer_buffer_size, @@ -266,7 +266,7 @@ bool WebGraphicsContext3DCommandBufferImpl::CreateContext() { if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kEnableGpuClientTracing)) { trace_gl_.reset(new gpu::gles2::GLES2TraceImplementation(GetGLInterface())); - setGLInterface(trace_gl_.get()); + SetGLInterface(trace_gl_.get()); } return true; } @@ -296,7 +296,7 @@ void WebGraphicsContext3DCommandBufferImpl::Destroy() { // issued on this context might not be visible to other contexts in the // share group. gl->Flush(); - setGLInterface(NULL); + SetGLInterface(nullptr); } trace_gl_.reset(); @@ -306,7 +306,7 @@ void WebGraphicsContext3DCommandBufferImpl::Destroy() { real_gl_.reset(); command_buffer_.reset(); - host_ = NULL; + host_ = nullptr; } gpu::ContextSupport* |