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

chrome/renderer/render_view.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.
 
 #include "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 2481 matching lines @@
       new media::FilterFactoryCollection();
   // Add in any custom filter factories first.
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
     // Add the chrome specific audio renderer.
     factory->AddFactory(
         AudioRendererImpl::CreateFactory(audio_message_filter()));
   }
 
   if (cmd_line->HasSwitch(switches::kEnableAcceleratedDecoding) &&
-      !cmd_line->HasSwitch(switches::kDisableAcceleratedCompositing)) {
+      cmd_line->HasSwitch(switches::kEnableAcceleratedCompositing)) {
     // Add the hardware video decoder factory.
     // TODO(hclam): This assumes that ggl::Context is set to current
     // internally. I need to make it more explicit to get the context.
     bool ret = frame->view()->graphicsContext3D()->makeContextCurrent();
     CHECK(ret) << "Failed to switch context";
 
     factory->AddFactory(IpcVideoDecoder::CreateFactory(
         MessageLoop::current(), ggl::GetCurrentContext()));
   }
 
@@ skipping 3485 matching lines @@
 }
 
 void RenderView::OnAsyncFileOpened(base::PlatformFileError error_code,
                                    IPC::PlatformFileForTransit file_for_transit,
                                    int message_id) {
   pepper_delegate_.OnAsyncFileOpened(
       error_code,
       IPC::PlatformFileForTransitToPlatformFile(file_for_transit),
       message_id);
 }