Merge 63535 - Disable GPU features AcceleratingCompositing and WebGL by defau...

chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if defined(ENABLE_GPU)
 
 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
@@ skipping 79 matching lines @@
         /*opaque=*/true, /*root=*/true);
     view_id = static_cast<gfx::NativeViewId>(plugin_handle_);
 #endif
     web_view_ = web_view;
     context_ = ggl::CreateViewContext(
         host,
         view_id,
         renderview->routing_id(),
         attribs);
   } else {
-    bool compositing_enabled = !CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kDisableAcceleratedCompositing);
+    bool compositing_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableAcceleratedCompositing);
     ggl::Context* parent_context = NULL;
     // If GPU compositing is enabled we need to create a GL context that shares
     // resources with the compositor's context.
     if (compositing_enabled) {
       // Asking for the WebGraphicsContext3D on the WebView will force one to
       // be created if it doesn't already exist. When the compositor is created
       // for the view it will use the same context.
       WebKit::WebGraphicsContext3D* view_context =
           web_view->graphicsContext3D();
       if (view_context) {
@@ skipping 901 matching lines @@
 }
 
 void WebGraphicsContext3DCommandBufferImpl::copyTextureToCompositor(
     unsigned texture, unsigned parentTexture) {
   makeContextCurrent();
   glCopyTextureToParentTexture(texture, parentTexture);
   glFlush();
 }
 
 #endif  // defined(ENABLE_GPU)