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

Side by Side Diff: chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc

Issue 3348012: Enable webgl and accelerated compositing by default on all platforms. Removes... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/renderer/render_view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #if defined(ENABLE_GPU) 5 #if defined(ENABLE_GPU)
6 6
7 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h" 7 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
8 8
9 #include <GLES2/gl2.h> 9 #include <GLES2/gl2.h>
10 #ifndef GL_GLEXT_PROTOTYPES 10 #ifndef GL_GLEXT_PROTOTYPES
(...skipping 22 matching lines...) Expand all
33 WebGraphicsContext3DCommandBufferImpl:: 33 WebGraphicsContext3DCommandBufferImpl::
34 ~WebGraphicsContext3DCommandBufferImpl() { 34 ~WebGraphicsContext3DCommandBufferImpl() {
35 if (context_) { 35 if (context_) {
36 ggl::DestroyContext(context_); 36 ggl::DestroyContext(context_);
37 } 37 }
38 } 38 }
39 39
40 bool WebGraphicsContext3DCommandBufferImpl::initialize( 40 bool WebGraphicsContext3DCommandBufferImpl::initialize(
41 WebGraphicsContext3D::Attributes attributes, 41 WebGraphicsContext3D::Attributes attributes,
42 WebKit::WebView* web_view) { 42 WebKit::WebView* web_view) {
43 bool compositing_enabled = CommandLine::ForCurrentProcess()->HasSwitch( 43 bool compositing_enabled = !CommandLine::ForCurrentProcess()->HasSwitch(
44 switches::kEnableAcceleratedCompositing); 44 switches::kDisableAcceleratedCompositing);
45 ggl::Context* parent_context = NULL; 45 ggl::Context* parent_context = NULL;
46 // If GPU compositing is enabled we need to create a GL context that shares 46 // If GPU compositing is enabled we need to create a GL context that shares
47 // resources with the compositor's context. 47 // resources with the compositor's context.
48 if (compositing_enabled) { 48 if (compositing_enabled) {
49 // Asking for the GLES2Context on the WebView will force one to be created 49 // Asking for the GLES2Context on the WebView will force one to be created
50 // if it doesn't already exist. When the compositor is created for the view 50 // if it doesn't already exist. When the compositor is created for the view
51 // it will use the same context. 51 // it will use the same context.
52 WebKit::WebGLES2Context* view_gles2_context = web_view->gles2Context(); 52 WebKit::WebGLES2Context* view_gles2_context = web_view->gles2Context();
53 if (!view_gles2_context) 53 if (!view_gles2_context)
54 return false; 54 return false;
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 889
890 void WebGraphicsContext3DCommandBufferImpl::copyTextureToCompositor( 890 void WebGraphicsContext3DCommandBufferImpl::copyTextureToCompositor(
891 unsigned texture, unsigned parentTexture) { 891 unsigned texture, unsigned parentTexture) {
892 makeContextCurrent(); 892 makeContextCurrent();
893 glCopyTextureToParentTexture(texture, parentTexture); 893 glCopyTextureToParentTexture(texture, parentTexture);
894 glFlush(); 894 glFlush();
895 } 895 }
896 896
897 #endif // defined(ENABLE_GPU) 897 #endif // defined(ENABLE_GPU)
898 898
OLDNEW
« no previous file with comments | « chrome/renderer/render_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698