Fold views_compositor=1 into use_aura=1

Fold views_compositor=1 into use_aura=1

We don't have a use case for views_compositor=1 and use_aura=0 (and it's
broken/untested anyway), so this simplifies things a little bit.

BUG=None
TEST=compiles, tests pass.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=119583

[Ben Goodger (Google), 2012-01-28 00:36:27]

LGTM

On Fri, Jan 27, 2012 at 4:08 PM, <piman@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Fold views_compositor=1 into use_aura=1
>
> We don't have a use case for views_compositor=1 and use_aura=0 (and it's
> broken/untested anyway), so this simplifies things a little bit.
>
> BUG=None
> TEST=compiles, tests pass.
>
>
> Please review this at
https://chromiumcodereview.**appspot.com/9225038/<https://chromiumcodereview....
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M build/common.gypi
>  M chrome/chrome_dll.gypi
>  M content/content_tests.gypi
>  M ui/gfx/compositor/compositor.**gyp
>  M ui/gfx/compositor/compositor_**setup.h
>  M ui/views/view.cc
>  M ui/views/view_unittest.cc
>  M ui/views/widget/native_widget_**win.cc
>
>
> Index: build/common.gypi
> diff --git a/build/common.gypi b/build/common.gypi
> index 161464c9237c8cf41af138d9243807**263660b675..**
> e1443fdeb4dc65f2e5c68790e7a454**b1df99812e 100644
> --- a/build/common.gypi
> +++ b/build/common.gypi
> @@ -27,9 +27,6 @@
>           # Whether we are using Views Toolkit
>           'toolkit_views%': 0,
>
> -          # Whether the compositor is enabled on views.
> -          'views_compositor%': 0,
> -
>           # Whether or not we are using the Aura windowing framework.
>           'use_aura%': 0,
>
> @@ -48,7 +45,6 @@
>         },
>         # Copy conditionally-set variables out one scope.
>         'chromeos%': '<(chromeos)',
> -        'views_compositor%': '<(views_compositor)',
>         'use_aura%': '<(use_aura)',
>         'use_ash%': '<(use_ash)',
>         'use_openssl%': '<(use_openssl)',
> @@ -78,11 +74,6 @@
>           }, {
>             'toolkit_views%': 0,
>           }],
> -
> -          # Use the views compositor when using the Aura window manager.
> -          ['use_aura==1', {
> -            'views_compositor%': 1,
> -          }],
>         ],
>       },
>
> @@ -90,7 +81,6 @@
>       'chromeos%': '<(chromeos)',
>       'host_arch%': '<(host_arch)',
>       'toolkit_views%': '<(toolkit_views)',
> -      'views_compositor%': '<(views_compositor)',
>       'use_aura%': '<(use_aura)',
>       'use_ash%': '<(use_ash)',
>       'use_openssl%': '<(use_openssl)',
> @@ -376,7 +366,7 @@
>
>         # Use GPU accelerated cross process image transport by default
>         # on linux builds with the Aura window manager
> -        ['views_compositor==1 and OS=="linux"', {
> +        ['use_aura==1 and OS=="linux"', {
>           'ui_compositor_image_**transport%': 1,
>         }, {
>           'ui_compositor_image_**transport%': 0,
> @@ -402,7 +392,6 @@
>     'host_arch%': '<(host_arch)',
>     'library%': 'static_library',
>     'toolkit_views%': '<(toolkit_views)',
> -    'views_compositor%': '<(views_compositor)',
>     'ui_compositor_image_**transport%': '<(ui_compositor_image_**
> transport)',
>     'use_webkit_compositor%': '<(use_webkit_compositor)',
>     'use_aura%': '<(use_aura)',
> @@ -1044,9 +1033,6 @@
>       ['toolkit_views==1', {
>         'defines': ['TOOLKIT_VIEWS=1'],
>       }],
> -      ['views_compositor==1', {
> -        'defines': ['VIEWS_COMPOSITOR=1'],
> -      }],
>       ['ui_compositor_image_**transport==1', {
>         'defines': ['UI_COMPOSITOR_IMAGE_**TRANSPORT'],
>       }],
> Index: chrome/chrome_dll.gypi
> diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
> index 75f8b21ad72646d28019e0128b3509**05a4168a8b..**
> 7964ed5c8d9f2df5180b2a97ee35c5**e18b4f7447 100644
> --- a/chrome/chrome_dll.gypi
> +++ b/chrome/chrome_dll.gypi
> @@ -48,7 +48,7 @@
>             'app/policy/cloud_policy_**codegen.gyp:policy',
>           ],
>           'conditions': [
> -            ['views_compositor==1', {
> +            ['use_aura==1', {
>               'dependencies': [
>                 '../ui/gfx/compositor/**compositor.gyp:compositor',
>               ],
> Index: content/content_tests.gypi
> diff --git a/content/content_tests.gypi b/content/content_tests.gypi
> index 9f3d2e7bf902f65f6bd74a06b0d6e0**ebfbbed586..**
> f75d1a417e8eb0077696ee98a91c2d**5d7fb1b426 100644
> --- a/content/content_tests.gypi
> +++ b/content/content_tests.gypi
> @@ -141,7 +141,7 @@
>             '../build/linux/system.gyp:**glib',
>           ],
>         }],
> -        ['views_compositor==1', {
> +        ['use_aura==1', {
>           'dependencies': [
>             '../ui/gfx/compositor/**compositor.gyp:compositor',
>           ],
> Index: ui/gfx/compositor/compositor.**gyp
> diff --git a/ui/gfx/compositor/**compositor.gyp b/ui/gfx/compositor/**
> compositor.gyp
> index 82ede851ee046573f219aee7d3888a**1a59649fd9..**
> 759d53be63822862bc1ba60e72fd8c**eb5bfe4921 100644
> --- a/ui/gfx/compositor/**compositor.gyp
> +++ b/ui/gfx/compositor/**compositor.gyp
> @@ -56,7 +56,7 @@
>         'test_web_graphics_context_3d.**h',
>       ],
>       'conditions': [
> -        ['OS == "win" and views_compositor == 1', {
> +        ['OS == "win" and use_aura == 1', {
>           # TODO(sky): before we make this real need to remove
>           # IDR_BITMAP_BRUSH_IMAGE.
>           'dependencies': [
> Index: ui/gfx/compositor/compositor_**setup.h
> diff --git a/ui/gfx/compositor/**compositor_setup.h b/ui/gfx/compositor/**
> compositor_setup.h
> index 717fbf921e5ddd9bc420e3026e4ca3**9baa7f8aa0..**
> 9978e7fe345a63fdebb3fabbf8a726**5f67c2e3a9 100644
> --- a/ui/gfx/compositor/**compositor_setup.h
> +++ b/ui/gfx/compositor/**compositor_setup.h
> @@ -12,7 +12,7 @@ namespace ui {
>
>  // Configures the compositor in such a way that it doesn't render
> anything.
>  // Does nothing on platforms that aren't using the compositor.
> -#if !defined(VIEWS_COMPOSITOR)
> +#if !defined(USE_AURA)
>  // To centralize the ifdef to this file we define the function as doing
> nothing
>  // on all platforms that don't use a compositor.
>  static inline void SetupTestCompositor() {}
> Index: ui/views/view.cc
> diff --git a/ui/views/view.cc b/ui/views/view.cc
> index ce35899fc4e1e681de5daaaeb6c3bc**29d0ed5f1e..**
> b900c2d78d6d31817c1f773aa69953**ea117c5358 100644
> --- a/ui/views/view.cc
> +++ b/ui/views/view.cc
> @@ -45,7 +45,7 @@ namespace {
>
>  // Whether to use accelerated compositing when necessary (e.g. when a
> view has a
>  // transformation).
> -#if defined(VIEWS_COMPOSITOR)
> +#if defined(USE_AURA)
>  bool use_acceleration_when_possible = true;
>  #else
>  bool use_acceleration_when_possible = false;
> Index: ui/views/view_unittest.cc
> diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
> index ea383bc9c05e5991bd3f6638fc9d6b**610716ccfa..**
> 9e55992b46520259741fd5b93cd93e**3828e5f08a 100644
> --- a/ui/views/view_unittest.cc
> +++ b/ui/views/view_unittest.cc
> @@ -2536,7 +2536,7 @@ TEST_F(ViewTest, AddExistingChild) {
>  // Layers
>  //////////////////////////////**//////////////////////////////**
> ////////////////////
>
> -#if defined(VIEWS_COMPOSITOR)
> +#if defined(USE_AURA)
>
>  namespace {
>
> @@ -2575,14 +2575,10 @@ class ViewLayerTest : public ViewsTestBase {
>
>   // Returns the Layer used by the RootView.
>   ui::Layer* GetRootLayer() {
> -#if defined(USE_AURA)
>     ui::Layer* root_layer = NULL;
>     gfx::Point origin;
>     widget()->**CalculateOffsetToAncestorWithL**ayer(&origin,
> &root_layer);
>     return root_layer;
> -#else
> -    return widget()->GetRootView()->**layer();
> -#endif
>   }
>
>   virtual void SetUp() OVERRIDE {
> @@ -2612,45 +2608,13 @@ class ViewLayerTest : public ViewsTestBase {
>   bool old_use_acceleration_;
>  };
>
> -#if !defined(USE_AURA)
> -// This test assumes a particular layer hierarchy that isn't valid for
> aura.
> -// Ensures the RootView has a layer and its set up correctly.
> -TEST_F(ViewLayerTest, RootState) {
> -  ui::Layer* layer = widget()->GetRootView()->**layer();
> -  ASSERT_TRUE(layer);
> -  EXPECT_FALSE(layer->parent());
> -  EXPECT_EQ(0u, layer->children().size());
> -  EXPECT_FALSE(layer->transform(**).HasChange());
> -  EXPECT_EQ(widget()->**GetRootView()->bounds(), layer->bounds());
> -  EXPECT_TRUE(layer->**GetCompositor() != NULL);
> -}
> -
> -// Verifies that the complete bounds of a texture are updated if the
> texture
> -// needs to be refreshed and paint with a clip is invoked.
> -// This test invokes OnNativeWidgetPaintAccelerated**, which is not used
> by aura.
> -TEST_F(ViewLayerTest, PaintAll) {
> -  View* view = widget()->GetRootView();
> -  ui::Layer* layer = GetRootLayer();
> -  view->SetBounds(0, 0, 200, 200);
> -  widget()->**OnNativeWidgetPaintAccelerated**(gfx::Rect(0, 0, 1, 1));
> -  ASSERT_TRUE(layer != NULL);
> -  const ui::TestTexture* texture =
> -      static_cast<const ui::TestTexture*>(layer->**texture());
> -  ASSERT_TRUE(texture != NULL);
> -  EXPECT_EQ(view->**GetLocalBounds(), texture->bounds_of_last_paint(**));
> -}
> -#endif
>
>  TEST_F(ViewLayerTest, LayerToggling) {
>   // Because we lazily create textures the calls to DrawTree are necessary
> to
>   // ensure we trigger creation of textures.
> -#if defined(USE_AURA)
>   ui::Layer* root_layer = NULL;
>   gfx::Point origin;
>   widget()->**CalculateOffsetToAncestorWithL**ayer(&origin, &root_layer);
> -#else
> -  ui::Layer* root_layer = widget()->GetRootView()->**layer();
> -#endif
>   View* content_view = new View;
>   widget()->SetContentsView(**content_view);
>
> @@ -2982,7 +2946,6 @@ TEST_F(ViewLayerTest, FLAKY_ViewLayerTreesInSync) {
>   EXPECT_TRUE(**ViewAndLayerTreeAreConsistent(**content,
> content->layer()));
>  }
>
> -#if defined(USE_AURA)
>  // Verifies when views are reordered the layer is also reordered. The
> widget is
>  // providing the parent layer.
>  TEST_F(ViewLayerTest, ReorderUnderWidget) {
> @@ -3006,8 +2969,7 @@ TEST_F(ViewLayerTest, ReorderUnderWidget) {
>   EXPECT_EQ(c1->layer(), parent_layer->children()[1]);
>   EXPECT_EQ(c2->layer(), parent_layer->children()[0]);
>  }
> -#endif
>
> -#endif  // VIEWS_COMPOSITOR
> +#endif  // USE_AURA
>
>  }  // namespace views
> Index: ui/views/widget/native_widget_**win.cc
> diff --git a/ui/views/widget/native_**widget_win.cc
> b/ui/views/widget/native_**widget_win.cc
> index 43581ff26dc7de234b97f1d7c41963**90e2bb350f..**
> 8ce9e9249df0bc5742541146c286dd**8fe7ef3c79 100644
> --- a/ui/views/widget/native_**widget_win.cc
> +++ b/ui/views/widget/native_**widget_win.cc
> @@ -1297,24 +1297,6 @@ LRESULT NativeWidgetWin::OnCreate(**CREATESTRUCT*
> create_struct) {
>   // creation time.
>   ClientAreaSizeChanged();
>
> -#if defined(VIEWS_COMPOSITOR)
> -  if (View::get_use_acceleration_**when_possible()) {
> -    if (ui::Compositor::compositor_**factory()) {
> -      compositor_ = (*Widget::compositor_factory()**)(this);
> -    } else {
> -      CRect window_rect;
> -      GetClientRect(&window_rect);
> -      compositor_ = ui::Compositor::Create(this,
> -          hwnd(),
> -          gfx::Size(window_rect.Width(), window_rect.Height()));
> -    }
> -    if (compositor_.get()) {
> -      delegate_->AsWidget()->**GetRootView()->**SetPaintToLayer(true);
> -      compositor_->SetRootLayer(**delegate_->AsWidget()->**
> GetRootView()->layer());
> -    }
> -  }
> -#endif
> -
>   delegate_->**OnNativeWidgetCreated();
>
>   // Get access to a modifiable copy of the system menu.
>
>
>

[commit-bot: I haz the power, 2012-01-28 00:46:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/9225038/1

[commit-bot: I haz the power, 2012-01-28 03:23:03]

Change committed as 119583