Revert 118789 - Always use webkit compositor

BUG=None
TEST=None


Review URL: http://codereview.chromium.org/9141034

TBR=piman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9283008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118792 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 14 insertions, 20 deletions

diff --git a/build/common.gypi b/build/common.gypi
index b949544..684d39b 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -83,6 +83,13 @@
           ['use_aura==1', {
             'views_compositor%': 1,
           }],
+
+          # Use the WebKit compositor for ui, when Aura is on.
+          ['use_aura==1', {
+            'use_webkit_compositor%': 1,
+          }, {
+            'use_webkit_compositor%': 0,
+          }],
         ],
       },
 
@@ -91,6 +98,7 @@
       'host_arch%': '<(host_arch)',
       'toolkit_views%': '<(toolkit_views)',
       'views_compositor%': '<(views_compositor)',
+      'use_webkit_compositor%': '<(use_webkit_compositor)',
       'use_aura%': '<(use_aura)',
       'use_ash%': '<(use_ash)',
       'use_openssl%': '<(use_openssl)',
@@ -253,9 +261,6 @@
       # Enable plug-in installation by default.
       'enable_plugin_installation%': 1,
 
-      # Use the WebKit compositor for ui.
-      'use_webkit_compositor%': 1,
-
       'conditions': [
         # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of
         # the 'conditions' clause.  Initial attempts resulted in chromium and
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index fefc784..0c762ba 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 {
@@ -16,7 +16,7 @@
             'app/policy/cloud_policy_codegen.gyp:policy',
           ],
           'conditions': [
-            ['use_webkit_compositor==1 and views_compositor==1', {
+            ['use_webkit_compositor==1', {
               'dependencies': [
                 '../ui/gfx/compositor/compositor.gyp:compositor',
               ],
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 19c6035..2e3e4b5 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -135,7 +135,7 @@
             '../build/linux/system.gyp:glib',
           ],
         }],
-        ['use_webkit_compositor==1 and views_compositor==1', {
+        ['use_webkit_compositor==1', {
           'dependencies': [
             '../ui/gfx/compositor/compositor.gyp:compositor',
           ],
diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc
index e1cecd9..ef67f6d 100644
--- a/content/test/content_test_suite.cc
+++ b/content/test/content_test_suite.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -89,4 +89,3 @@ void ContentTestSuite::Initialize() {
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestContentClientInitializer);
 }
-
diff --git a/ui/gfx/compositor/compositor_cc.cc b/ui/gfx/compositor/compositor_cc.cc
index 91b2cb6..8957990 100644
--- a/ui/gfx/compositor/compositor_cc.cc
+++ b/ui/gfx/compositor/compositor_cc.cc
@@ -264,19 +264,10 @@ WebKit::WebGraphicsContext3D* CompositorCC::createContext3D() {
     // Use context that results in no rendering to the screen.
     context = new TestWebGraphicsContext3D();
   } else {
-#if defined(OS_MACOSX) && !defined(USE_AURA)
-    // Non-Aura builds compile this code but doesn't call it. Unfortunately
-    // this is where we translate gfx::AcceleratedWidget to
-    // gfx::PluginWindowHandle, and they are different on non-Aura Mac.
-    // TODO(piman): remove ifdefs when AcceleratedWidget is rationalized on Mac.
-    NOTIMPLEMENTED();
-    return NULL;
-#else
     gfx::GLShareGroup* share_group =
         SharedResourcesCC::GetInstance()->GetShareGroup();
     context = new webkit::gpu::WebGraphicsContext3DInProcessImpl(
         widget_, share_group);
-#endif
   }
   WebKit::WebGraphicsContext3D::Attributes attrs;
   context->initialize(attrs, 0, true);
diff --git a/ui/gfx/compositor/compositor_setup.h b/ui/gfx/compositor/compositor_setup.h
index fc605ea..a339ede 100644
--- a/ui/gfx/compositor/compositor_setup.h
+++ b/ui/gfx/compositor/compositor_setup.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -15,8 +15,7 @@ namespace ui {
 #if !defined(VIEWS_COMPOSITOR)
 // To centralize the ifdef to this file we define the function as doing nothing
 // on all platforms that don't use a compositor.
-COMPOSITOR_EXPORT inline void SetupTestCompositor() {}
-COMPOSITOR_EXPORT inline void DisableTestCompositor() {}
+COMPOSITOR_EXPORT void SetupTestCompositor() {}
 #else
 COMPOSITOR_EXPORT void SetupTestCompositor();