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

Side by Side Diff: webkit/common/gpu/webgraphicscontext3d_impl.cc

Issue 470973002: gpu: Remove WebGraphicsContext3D::makeContextCurrent() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix in unittests Created 6 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/common/gpu/webgraphicscontext3d_impl.h" 5 #include "webkit/common/gpu/webgraphicscontext3d_impl.h"
6 6
7 #include "base/atomicops.h" 7 #include "base/atomicops.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "gpu/GLES2/gl2extchromium.h" 10 #include "gpu/GLES2/gl2extchromium.h"
(...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after
930 930
931 DELEGATE_TO_GL_6(framebufferTexture2DMultisampleEXT, 931 DELEGATE_TO_GL_6(framebufferTexture2DMultisampleEXT,
932 FramebufferTexture2DMultisampleEXT, 932 FramebufferTexture2DMultisampleEXT,
933 WGC3Denum, WGC3Denum, WGC3Denum, WebGLId, WGC3Dint, WGC3Dsizei) 933 WGC3Denum, WGC3Denum, WGC3Denum, WebGLId, WGC3Dint, WGC3Dsizei)
934 934
935 DELEGATE_TO_GL_5(renderbufferStorageMultisampleEXT, 935 DELEGATE_TO_GL_5(renderbufferStorageMultisampleEXT,
936 RenderbufferStorageMultisampleEXT, WGC3Denum, WGC3Dsizei, 936 RenderbufferStorageMultisampleEXT, WGC3Denum, WGC3Dsizei,
937 WGC3Denum, WGC3Dsizei, WGC3Dsizei) 937 WGC3Denum, WGC3Dsizei, WGC3Dsizei)
938 938
939 GrGLInterface* WebGraphicsContext3DImpl::createGrGLInterface() { 939 GrGLInterface* WebGraphicsContext3DImpl::createGrGLInterface() {
940 makeContextCurrent();
941 return skia_bindings::CreateCommandBufferSkiaGLBinding(); 940 return skia_bindings::CreateCommandBufferSkiaGLBinding();
942 } 941 }
943 942
944 ::gpu::gles2::GLES2ImplementationErrorMessageCallback* 943 ::gpu::gles2::GLES2ImplementationErrorMessageCallback*
945 WebGraphicsContext3DImpl::getErrorMessageCallback() { 944 WebGraphicsContext3DImpl::getErrorMessageCallback() {
946 if (!client_error_message_callback_) { 945 if (!client_error_message_callback_) {
947 client_error_message_callback_.reset( 946 client_error_message_callback_.reset(
948 new WebGraphicsContext3DErrorMessageCallback(this)); 947 new WebGraphicsContext3DErrorMessageCallback(this));
949 } 948 }
950 return client_error_message_callback_.get(); 949 return client_error_message_callback_.get();
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 output_attribs->stencil_size = attributes.stencil ? 8 : 0; 989 output_attribs->stencil_size = attributes.stencil ? 8 : 0;
991 output_attribs->samples = attributes.antialias ? 4 : 0; 990 output_attribs->samples = attributes.antialias ? 4 : 0;
992 output_attribs->sample_buffers = attributes.antialias ? 1 : 0; 991 output_attribs->sample_buffers = attributes.antialias ? 1 : 0;
993 output_attribs->fail_if_major_perf_caveat = 992 output_attribs->fail_if_major_perf_caveat =
994 attributes.failIfMajorPerformanceCaveat; 993 attributes.failIfMajorPerformanceCaveat;
995 output_attribs->bind_generates_resource = false; 994 output_attribs->bind_generates_resource = false;
996 } 995 }
997 996
998 } // namespace gpu 997 } // namespace gpu
999 } // namespace webkit 998 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/common/gpu/webgraphicscontext3d_impl.h ('k') | webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698