diff options
158 files changed, 376 insertions, 376 deletions
@@ -283,7 +283,7 @@ 'filepath': 'tools/emacs/.*', }, 'browser_compositor': { - 'filepath': 'ui/gfx/compositor/.*' + 'filepath': 'ui/compositor/.*' }, 'browser_gl': { 'filepath': 'ui/gfx/gl/.*' diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 2deeb97..800bf44 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -5,14 +5,14 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_table.h" -#include "ash/desktop_background/desktop_background_controller.h" #include "ash/ash_switches.h" #include "ash/caps_lock_delegate.h" +#include "ash/desktop_background/desktop_background_controller.h" #include "ash/focus_cycler.h" #include "ash/ime_control_delegate.h" #include "ash/launcher/launcher.h" -#include "ash/launcher/launcher_model.h" #include "ash/launcher/launcher_delegate.h" +#include "ash/launcher/launcher_model.h" #include "ash/monitor/multi_monitor_manager.h" #include "ash/screenshot_delegate.h" #include "ash/shell.h" @@ -30,11 +30,11 @@ #include "ui/aura/root_window.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator_manager.h" -#include "ui/gfx/compositor/debug_utils.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animation_sequence.h" -#include "ui/gfx/compositor/layer_animator.h" -#include "ui/gfx/compositor/screen_rotation.h" +#include "ui/compositor/debug_utils.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animation_sequence.h" +#include "ui/compositor/layer_animator.h" +#include "ui/compositor/screen_rotation.h" #include "ui/oak/oak.h" namespace { diff --git a/ash/app_list/app_list.cc b/ash/app_list/app_list.cc index 4f939026..7971973 100644 --- a/ash/app_list/app_list.cc +++ b/ash/app_list/app_list.cc @@ -6,16 +6,16 @@ #include "ash/app_list/app_list_view.h" #include "ash/app_list/icon_cache.h" -#include "ash/shell_delegate.h" #include "ash/shell.h" +#include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "ash/wm/shelf_layout_manager.h" #include "ash/wm/window_util.h" #include "ui/aura/event.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" #include "ui/gfx/transform_util.h" diff --git a/ash/app_list/app_list.h b/ash/app_list/app_list.h index 5725c4d..7a2d6af 100644 --- a/ash/app_list/app_list.h +++ b/ash/app_list/app_list.h @@ -11,7 +11,7 @@ #include "base/timer.h" #include "ui/aura/event_filter.h" #include "ui/aura/root_window_observer.h" -#include "ui/gfx/compositor/layer_animation_observer.h" +#include "ui/compositor/layer_animation_observer.h" #include "ui/views/widget/widget.h" namespace ash { diff --git a/ash/app_list/app_list_view.cc b/ash/app_list/app_list_view.cc index 4e47e36..42a535e 100644 --- a/ash/app_list/app_list_view.cc +++ b/ash/app_list/app_list_view.cc @@ -12,8 +12,8 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/wm/shelf_layout_manager.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" #include "ui/gfx/transform_util.h" #include "ui/views/background.h" diff --git a/ash/ash.gyp b/ash/ash.gyp index 37f28da..6119f90 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -27,7 +27,7 @@ '../third_party/icu/icu.gyp:icuuc', '../ui/aura/aura.gyp:aura', '../ui/base/strings/ui_strings.gyp:ui_strings', - '../ui/gfx/compositor/compositor.gyp:compositor', + '../ui/compositor/compositor.gyp:compositor', '../ui/oak/oak.gyp:oak', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', @@ -337,8 +337,8 @@ '../third_party/icu/icu.gyp:icuuc', '../ui/aura/aura.gyp:aura', '../ui/aura/aura.gyp:test_support_aura', - '../ui/gfx/compositor/compositor.gyp:compositor', - '../ui/gfx/compositor/compositor.gyp:compositor_test_support', + '../ui/compositor/compositor.gyp:compositor', + '../ui/compositor/compositor.gyp:compositor_test_support', '../ui/ui.gyp:gfx_resources', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', @@ -458,8 +458,8 @@ '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../ui/aura/aura.gyp:aura', - '../ui/gfx/compositor/compositor.gyp:compositor', - '../ui/gfx/compositor/compositor.gyp:compositor_test_support', + '../ui/compositor/compositor.gyp:compositor', + '../ui/compositor/compositor.gyp:compositor_test_support', '../ui/ui.gyp:gfx_resources', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc index e512d66..e345158 100644 --- a/ash/desktop_background/desktop_background_controller.cc +++ b/ash/desktop_background/desktop_background_controller.cc @@ -12,9 +12,9 @@ #include "base/logging.h" #include "grit/ui_resources.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/image/image.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/compositor/layer.h" +#include "ui/gfx/image/image.h" #include "ui/views/widget/widget.h" namespace ash { diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index a417965..80e3ce0 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -16,10 +16,10 @@ #include "grit/ui_resources.h" #include "ui/aura/root_window.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animation_observer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animation_observer.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/image/image.h" #include "ui/views/widget/widget.h" diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc index 9d279f8..7d57a0e 100644 --- a/ash/dip_unittest.cc +++ b/ash/dip_unittest.cc @@ -17,7 +17,7 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/gfx/insets.h" #include "ui/gfx/monitor.h" #include "ui/gfx/screen.h" diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 7a76eca..b06beed67 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -13,9 +13,9 @@ #include "ui/aura/window.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animator.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animator.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" #include "ui/views/views_delegate.h" diff --git a/ash/drag_drop/drag_drop_controller.h b/ash/drag_drop/drag_drop_controller.h index 1bb2503..dfaaf43 100644 --- a/ash/drag_drop/drag_drop_controller.h +++ b/ash/drag_drop/drag_drop_controller.h @@ -13,7 +13,7 @@ #include "ui/aura/window_observer.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/events.h" -#include "ui/gfx/compositor/layer_animation_observer.h" +#include "ui/compositor/layer_animation_observer.h" #include "ui/gfx/point.h" namespace aura { diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc index afb05dc..4ee1205 100644 --- a/ash/launcher/launcher.cc +++ b/ash/launcher/launcher.cc @@ -13,8 +13,8 @@ #include "ash/shell_window_ids.h" #include "ash/wm/shelf_layout_manager.h" #include "ui/aura/window.h" +#include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" #include "ui/gfx/image/image.h" #include "ui/views/accessible_pane_view.h" #include "ui/views/widget/widget.h" diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc index 0ee0489..8701f30 100644 --- a/ash/launcher/launcher_button.cc +++ b/ash/launcher/launcher_button.cc @@ -9,12 +9,12 @@ #include "ash/launcher/launcher_button_host.h" #include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/image/image.h" #include "ui/gfx/skbitmap_operations.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/image_view.h" namespace { diff --git a/ash/launcher/launcher_context_menu_unittest.cc b/ash/launcher/launcher_context_menu_unittest.cc index 225351e..04462d2 100644 --- a/ash/launcher/launcher_context_menu_unittest.cc +++ b/ash/launcher/launcher_context_menu_unittest.cc @@ -11,7 +11,7 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" namespace ash { diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index 4c9e846..86a6b9c 100644 --- a/ash/launcher/launcher_view.cc +++ b/ash/launcher/launcher_view.cc @@ -21,7 +21,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/gfx/image/image.h" #include "ui/views/animation/bounds_animator.h" #include "ui/views/controls/button/image_button.h" diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc index 38162c5..fa90f97 100644 --- a/ash/launcher/launcher_view_unittest.cc +++ b/ash/launcher/launcher_view_unittest.cc @@ -6,8 +6,8 @@ #include "ash/launcher/launcher.h" #include "ash/launcher/launcher_button.h" -#include "ash/launcher/launcher_model.h" #include "ash/launcher/launcher_icon_observer.h" +#include "ash/launcher/launcher_model.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/launcher_view_test_api.h" @@ -15,9 +15,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "ui/aura/window.h" #include "ui/aura/test/aura_test_base.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/aura/window.h" +#include "ui/compositor/layer.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 262a9c4..af07eae 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -8,8 +8,8 @@ #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" namespace { diff --git a/ash/shell.cc b/ash/shell.cc index 36391fd..bc8829a 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -70,8 +70,8 @@ #include "ui/aura/root_window.h" #include "ui/aura/ui_controls_aura.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animator.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animator.h" #include "ui/gfx/monitor.h" #include "ui/gfx/screen.h" #include "ui/gfx/size.h" diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 2aaaed2..2ce1d23 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -27,10 +27,10 @@ #include "ui/base/clipboard/clipboard.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/test/compositor_test_support.h" -#include "ui/views/test/test_views_delegate.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/views/focus/accelerator_handler.h" +#include "ui/views/test/test_views_delegate.h" namespace ash { namespace shell { diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index 020ec00..243273a 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -6,11 +6,11 @@ #include "ash/screensaver/screensaver_view.h" #include "ash/shell.h" -#include "ash/shell_delegate.h" -#include "ash/shell_window_ids.h" #include "ash/shell/example_factory.h" #include "ash/shell/panel_window.h" #include "ash/shell/toplevel_window.h" +#include "ash/shell_delegate.h" +#include "ash/shell_window_ids.h" #include "ash/wm/shadow_types.h" #include "base/bind.h" #include "base/time.h" @@ -18,8 +18,8 @@ #include "content/public/browser/browser_thread.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index c7f66e9..22508af 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -18,16 +18,16 @@ #include "ash/system/power/power_supply_status.h" #include "ash/system/power/tray_power.h" #include "ash/system/settings/tray_settings.h" -#include "ash/system/tray/tray_empty.h" -#include "ash/system/tray/tray_constants.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/system_tray_item.h" #include "ash/system/tray/system_tray_widget_delegate.h" +#include "ash/system/tray/tray_constants.h" +#include "ash/system/tray/tray_empty.h" #include "ash/system/tray_accessibility.h" #include "ash/system/tray_caps_lock.h" #include "ash/system/tray_update.h" -#include "ash/system/user/tray_user.h" #include "ash/system/user/login_status.h" +#include "ash/system/user/tray_user.h" #include "ash/wm/shadow_types.h" #include "ash/wm/shelf_layout_manager.h" #include "ash/wm/window_animations.h" @@ -44,11 +44,11 @@ #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/effects/SkBlurImageFilter.h" #include "ui/aura/root_window.h" -#include "ui/base/events.h" #include "ui/base/accessibility/accessible_view_state.h" +#include "ui/base/events.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" #include "ui/gfx/screen.h" #include "ui/gfx/skia_util.h" #include "ui/views/border.h" @@ -56,8 +56,8 @@ #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/label.h" -#include "ui/views/layout/fill_layout.h" #include "ui/views/layout/box_layout.h" +#include "ui/views/layout/fill_layout.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" diff --git a/ash/system/tray/tray_item_view.cc b/ash/system/tray/tray_item_view.cc index 22a605b..ddb9f31 100644 --- a/ash/system/tray/tray_item_view.cc +++ b/ash/system/tray/tray_item_view.cc @@ -5,7 +5,7 @@ #include "ash/system/tray/tray_item_view.h" #include "ui/base/animation/slide_animation.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/layout/fill_layout.h" diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc index 6b97915..d6f03af 100644 --- a/ash/system/tray_update.cc +++ b/ash/system/tray_update.cc @@ -16,9 +16,9 @@ #include "grit/ui_resources.h" #include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animation_sequence.h" -#include "ui/gfx/compositor/layer_animation_observer.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animation_observer.h" +#include "ui/compositor/layer_animation_sequence.h" #include "ui/gfx/image/image.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index 6972b90..46291f9 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -11,7 +11,7 @@ #include "ui/aura/env.h" #include "ui/aura/monitor_manager.h" #include "ui/aura/root_window.h" -#include "ui/gfx/compositor/layer_animator.h" +#include "ui/compositor/layer_animator.h" #include "ui/gfx/monitor.h" #include "ui/gfx/screen.h" diff --git a/ash/test/test_suite.cc b/ash/test/test_suite.cc index 48e3f45..5a17d37 100644 --- a/ash/test/test_suite.cc +++ b/ash/test/test_suite.cc @@ -9,8 +9,8 @@ #include "build/build_config.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" -#include "ui/gfx/compositor/compositor_setup.h" -#include "ui/gfx/compositor/test/compositor_test_support.h" +#include "ui/compositor/compositor_setup.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/gfx/gfx_paths.h" #if defined(OS_MACOSX) diff --git a/ash/wm/activation_controller.cc b/ash/wm/activation_controller.cc index b17c306..e2cefe6 100644 --- a/ash/wm/activation_controller.cc +++ b/ash/wm/activation_controller.cc @@ -16,7 +16,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" namespace ash { namespace internal { diff --git a/ash/wm/activation_controller_unittest.cc b/ash/wm/activation_controller_unittest.cc index bacef8d..ad99e02 100644 --- a/ash/wm/activation_controller_unittest.cc +++ b/ash/wm/activation_controller_unittest.cc @@ -15,7 +15,7 @@ #include "ui/aura/test/event_generator.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #if defined(OS_WIN) // Windows headers define macros for these function names which screw with us. diff --git a/ash/wm/base_layout_manager.cc b/ash/wm/base_layout_manager.cc index 6437a07..e9510c9 100644 --- a/ash/wm/base_layout_manager.cc +++ b/ash/wm/base_layout_manager.cc @@ -15,7 +15,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_property.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/gfx/screen.h" DECLARE_WINDOW_PROPERTY_TYPE(ui::WindowShowState) diff --git a/ash/wm/default_window_resizer.cc b/ash/wm/default_window_resizer.cc index efa3899..d59a811 100644 --- a/ash/wm/default_window_resizer.cc +++ b/ash/wm/default_window_resizer.cc @@ -12,8 +12,8 @@ #include "ui/aura/window_delegate.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" namespace ash { diff --git a/ash/wm/image_grid.h b/ash/wm/image_grid.h index 84119f5..7b53f88 100644 --- a/ash/wm/image_grid.h +++ b/ash/wm/image_grid.h @@ -6,12 +6,12 @@ #define ASH_WM_IMAGE_GRID_H_ #pragma once +#include "ash/ash_export.h" #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "ash/ash_export.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_delegate.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_delegate.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" @@ -169,7 +169,7 @@ class ASH_EXPORT ImageGrid { // A possibly-arbitrary window that is drawn at the same DPI // (i.e. on the same monitor) as this grid. - // TODO(oshima): move scale factor to gfx/compositor and remove this. + // TODO(oshima): move scale factor to ui/compositor/ and remove this. aura::Window* window_; // Layer that contains all of the image layers. diff --git a/ash/wm/panel_window_event_filter.cc b/ash/wm/panel_window_event_filter.cc index c4bf829..e8caa17 100644 --- a/ash/wm/panel_window_event_filter.cc +++ b/ash/wm/panel_window_event_filter.cc @@ -14,7 +14,7 @@ #include "ui/base/cursor/cursor.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" namespace ash { diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc index 9478de8..e70015e 100644 --- a/ash/wm/power_button_controller.cc +++ b/ash/wm/power_button_controller.cc @@ -14,11 +14,11 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animation_element.h" +#include "ui/compositor/layer_animation_sequence.h" +#include "ui/compositor/layer_animator.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animation_element.h" -#include "ui/gfx/compositor/layer_animation_sequence.h" -#include "ui/gfx/compositor/layer_animator.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" #include "ui/gfx/transform.h" diff --git a/ash/wm/resize_shadow.cc b/ash/wm/resize_shadow.cc index f8da30a..a9e0298 100644 --- a/ash/wm/resize_shadow.cc +++ b/ash/wm/resize_shadow.cc @@ -10,8 +10,8 @@ #include "ui/aura/window.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" namespace { diff --git a/ash/wm/root_window_layout_manager.cc b/ash/wm/root_window_layout_manager.cc index f4b6fff..52c117e 100644 --- a/ash/wm/root_window_layout_manager.cc +++ b/ash/wm/root_window_layout_manager.cc @@ -5,7 +5,7 @@ #include "ash/wm/root_window_layout_manager.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/views/widget/widget.h" namespace ash { diff --git a/ash/wm/screen_dimmer.cc b/ash/wm/screen_dimmer.cc index b902de0..a40a9bc 100644 --- a/ash/wm/screen_dimmer.cc +++ b/ash/wm/screen_dimmer.cc @@ -7,8 +7,8 @@ #include "ash/shell.h" #include "base/time.h" #include "ui/aura/root_window.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc index b66cd2f..8b7b58f 100644 --- a/ash/wm/screen_dimmer_unittest.cc +++ b/ash/wm/screen_dimmer_unittest.cc @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "ui/aura/root_window.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" namespace ash { namespace test { diff --git a/ash/wm/shadow.cc b/ash/wm/shadow.cc index 9cf54c9..49e9788 100644 --- a/ash/wm/shadow.cc +++ b/ash/wm/shadow.cc @@ -7,7 +7,7 @@ #include "ash/wm/image_grid.h" #include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/scoped_layer_animation_settings.h" namespace { diff --git a/ash/wm/shadow.h b/ash/wm/shadow.h index ae00a4d..a137085 100644 --- a/ash/wm/shadow.h +++ b/ash/wm/shadow.h @@ -6,10 +6,10 @@ #define ASH_WM_SHADOW_H_ #pragma once +#include "ash/ash_export.h" #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "ash/ash_export.h" -#include "ui/gfx/compositor/layer_animation_observer.h" +#include "ui/compositor/layer_animation_observer.h" #include "ui/gfx/rect.h" namespace aura { @@ -47,7 +47,7 @@ class ASH_EXPORT Shadow : public ui::ImplicitAnimationObserver { // |window| is a possibly-arbitrary window that is drawn at the same DPI // (i.e. on the same monitor) as this shadow. The actual bounds for the // shadow still has to be provided through |SetContentBounds()|. - // TODO(oshima): move scale factor to gfx/compositor and remove this. + // TODO(oshima): move scale factor to ui/compositor/ and remove this. void Init(aura::Window* window, Style style); // Returns |image_grid_|'s ui::Layer. This is exposed so it can be added to diff --git a/ash/wm/shadow_controller.cc b/ash/wm/shadow_controller.cc index 869a0b2..04aa99f 100644 --- a/ash/wm/shadow_controller.cc +++ b/ash/wm/shadow_controller.cc @@ -16,7 +16,7 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" using std::make_pair; diff --git a/ash/wm/shadow_controller_unittest.cc b/ash/wm/shadow_controller_unittest.cc index db1edfc..9879f55 100644 --- a/ash/wm/shadow_controller_unittest.cc +++ b/ash/wm/shadow_controller_unittest.cc @@ -17,7 +17,7 @@ #include "ui/aura/client/activation_client.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" namespace ash { namespace internal { diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc index af5aa75..188449a 100644 --- a/ash/wm/shelf_layout_manager.cc +++ b/ash/wm/shelf_layout_manager.cc @@ -18,10 +18,10 @@ #include "ui/aura/event.h" #include "ui/aura/event_filter.h" #include "ui/aura/root_window.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animation_observer.h" -#include "ui/gfx/compositor/layer_animator.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animation_observer.h" +#include "ui/compositor/layer_animator.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc index ea16d00..3f64f94 100644 --- a/ash/wm/shelf_layout_manager_unittest.cc +++ b/ash/wm/shelf_layout_manager_unittest.cc @@ -18,8 +18,8 @@ #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" #include "ui/base/animation/animation_container_element.h" -#include "ui/gfx/compositor/layer_animator.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animator.h" #include "ui/gfx/monitor.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/wm/system_modal_container_layout_manager.cc index e61c5ea..ae5dd63 100644 --- a/ash/wm/system_modal_container_layout_manager.cc +++ b/ash/wm/system_modal_container_layout_manager.cc @@ -16,10 +16,10 @@ #include "ui/aura/event.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animator.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animator.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc index b503c07..cc27bff 100644 --- a/ash/wm/system_modal_container_layout_manager_unittest.cc +++ b/ash/wm/system_modal_container_layout_manager_unittest.cc @@ -14,7 +14,7 @@ #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/views/events/event.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" diff --git a/ash/wm/toplevel_window_event_filter.cc b/ash/wm/toplevel_window_event_filter.cc index e6b9dc0..b03df24 100644 --- a/ash/wm/toplevel_window_event_filter.cc +++ b/ash/wm/toplevel_window_event_filter.cc @@ -21,8 +21,8 @@ #include "ui/base/cursor/cursor.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" namespace { diff --git a/ash/wm/visibility_controller.cc b/ash/wm/visibility_controller.cc index 839cce3..b1cbcd5 100644 --- a/ash/wm/visibility_controller.cc +++ b/ash/wm/visibility_controller.cc @@ -8,7 +8,7 @@ #include "ash/wm/window_animations.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" DECLARE_WINDOW_PROPERTY_TYPE(bool) diff --git a/ash/wm/visibility_controller_unittest.cc b/ash/wm/visibility_controller_unittest.cc index a69c97a..8a2f028 100644 --- a/ash/wm/visibility_controller_unittest.cc +++ b/ash/wm/visibility_controller_unittest.cc @@ -5,11 +5,11 @@ #include "ash/wm/visibility_controller.h" #include "ash/test/ash_test_base.h" -#include "ui/aura/test/test_windows.h" #include "ui/aura/test/test_window_delegate.h" +#include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animator.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animator.h" namespace ash { namespace internal { diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index 7e7f908..15394ff 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc @@ -18,11 +18,11 @@ #include "ui/aura/window.h" #include "ui/aura/window_observer.h" #include "ui/aura/window_property.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animation_observer.h" -#include "ui/gfx/compositor/layer_animation_sequence.h" -#include "ui/gfx/compositor/layer_animator.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animation_observer.h" +#include "ui/compositor/layer_animation_sequence.h" +#include "ui/compositor/layer_animator.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/interpolated_transform.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc index c860304..a9a97ad 100644 --- a/ash/wm/window_animations_unittest.cc +++ b/ash/wm/window_animations_unittest.cc @@ -9,8 +9,8 @@ #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" #include "ui/base/animation/animation_container_element.h" -#include "ui/gfx/compositor/layer_animator.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animator.h" namespace ash { namespace internal { diff --git a/ash/wm/window_resizer.cc b/ash/wm/window_resizer.cc index 94d1891..146f804 100644 --- a/ash/wm/window_resizer.cc +++ b/ash/wm/window_resizer.cc @@ -12,7 +12,7 @@ #include "ui/aura/window_delegate.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" namespace ash { diff --git a/ash/wm/workspace/phantom_window_controller.cc b/ash/wm/workspace/phantom_window_controller.cc index a23948f..db43d45 100644 --- a/ash/wm/workspace/phantom_window_controller.cc +++ b/ash/wm/workspace/phantom_window_controller.cc @@ -10,9 +10,9 @@ #include "ui/aura/window.h" #include "ui/aura/window_observer.h" #include "ui/base/animation/slide_animation.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/skia_util.h" #include "ui/views/painter.h" #include "ui/views/view.h" diff --git a/ash/wm/workspace/workspace_event_filter.cc b/ash/wm/workspace/workspace_event_filter.cc index 0768834..91c5c7c 100644 --- a/ash/wm/workspace/workspace_event_filter.cc +++ b/ash/wm/workspace/workspace_event_filter.cc @@ -14,7 +14,7 @@ #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/base/hit_test.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" namespace { diff --git a/ash/wm/workspace/workspace_manager.cc b/ash/wm/workspace/workspace_manager.cc index bd8df30..6a61b92 100644 --- a/ash/wm/workspace/workspace_manager.cc +++ b/ash/wm/workspace/workspace_manager.cc @@ -17,14 +17,14 @@ #include "base/auto_reset.h" #include "base/logging.h" #include "base/stl_util.h" -#include "ui/aura/env.h" #include "ui/aura/client/aura_constants.h" +#include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animator.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animator.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" #include "ui/gfx/transform.h" diff --git a/ash/wm/workspace/workspace_manager_unittest.cc b/ash/wm/workspace/workspace_manager_unittest.cc index 56f857c..34aceef 100644 --- a/ash/wm/workspace/workspace_manager_unittest.cc +++ b/ash/wm/workspace/workspace_manager_unittest.cc @@ -12,15 +12,15 @@ #include "ash/wm/property_util.h" #include "ash/wm/shelf_layout_manager.h" #include "ash/wm/window_util.h" -#include "ash/wm/workspace_controller.h" #include "ash/wm/workspace/workspace.h" #include "ash/wm/workspace/workspace_layout_manager.h" +#include "ash/wm/workspace_controller.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" #include "ui/aura/window.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/gfx/screen.h" using aura::Window; diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc index df054be..abf13d5 100644 --- a/ash/wm/workspace/workspace_window_resizer.cc +++ b/ash/wm/workspace/workspace_window_resizer.cc @@ -16,8 +16,8 @@ #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/base/hit_test.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" #include "ui/gfx/transform.h" diff --git a/build/all.gyp b/build/all.gyp index 857f6c8cf..00289020 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -554,7 +554,7 @@ '../chrome/chrome.gyp:interactive_ui_tests', '../chrome/chrome.gyp:unit_tests', '../ui/aura/aura.gyp:*', - '../ui/gfx/compositor/compositor.gyp:*', + '../ui/compositor/compositor.gyp:*', '../ui/ui.gyp:gfx_unittests', '../ui/views/views.gyp:views', '../ui/views/views.gyp:views_unittests', diff --git a/chrome/browser/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/chrome_browser_main_extra_parts_ash.cc index 37fffbab..a409e36 100644 --- a/chrome/browser/chrome_browser_main_extra_parts_ash.cc +++ b/chrome/browser/chrome_browser_main_extra_parts_ash.cc @@ -10,27 +10,27 @@ #include "ash/wm/key_rewriter_event_filter.h" #include "ash/wm/property_util.h" #include "base/command_line.h" -#include "chrome/common/chrome_switches.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/views/ash/caps_lock_handler.h" #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" #include "chrome/browser/ui/views/ash/key_rewriter.h" #include "chrome/browser/ui/views/ash/screenshot_taker.h" #include "chrome/browser/ui/views/ash/user_gesture_handler.h" -#include "ui/aura/env.h" +#include "chrome/common/chrome_switches.h" #include "ui/aura/aura_switches.h" #include "ui/aura/client/user_gesture_client.h" +#include "ui/aura/env.h" #include "ui/aura/monitor_manager.h" #include "ui/aura/root_window.h" -#include "ui/gfx/compositor/compositor_setup.h" +#include "ui/compositor/compositor_setup.h" #if defined(OS_CHROMEOS) #include "base/chromeos/chromeos_version.h" +#include "chrome/browser/chromeos/input_method/input_method_manager.h" +#include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/ui/views/ash/brightness_controller_chromeos.h" #include "chrome/browser/ui/views/ash/ime_controller_chromeos.h" #include "chrome/browser/ui/views/ash/volume_controller_chromeos.h" -#include "chrome/browser/chromeos/input_method/input_method_manager.h" -#include "chrome/browser/chromeos/login/user_manager.h" #endif ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc index cd369f5..a1aa8a1 100644 --- a/chrome/browser/chromeos/login/base_login_display_host.cc +++ b/chrome/browser/chromeos/login/base_login_display_host.cc @@ -41,13 +41,13 @@ #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h" #include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animation_element.h" -#include "ui/gfx/compositor/layer_animation_sequence.h" -#include "ui/gfx/compositor/layer_animator.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" -#include "ui/gfx/transform.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animation_element.h" +#include "ui/compositor/layer_animation_sequence.h" +#include "ui/compositor/layer_animator.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/rect.h" +#include "ui/gfx/transform.h" #include "ui/views/widget/widget.h" #include "unicode/timezone.h" diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 3778eaa..2ecbe10 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -83,7 +83,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "ui/base/ui_base_switches.h" -#include "ui/gfx/compositor/compositor_switches.h" +#include "ui/compositor/compositor_switches.h" #include "ui/gfx/gl/gl_switches.h" #include "webkit/plugins/plugin_switches.h" diff --git a/chrome/browser/ui/tabs/dock_info_ash.cc b/chrome/browser/ui/tabs/dock_info_ash.cc index f058680..598a175 100644 --- a/chrome/browser/ui/tabs/dock_info_ash.cc +++ b/chrome/browser/ui/tabs/dock_info_ash.cc @@ -7,7 +7,7 @@ #include "ash/shell.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" // DockInfo ------------------------------------------------------------------- diff --git a/chrome/browser/ui/views/ash/screenshot_taker.h b/chrome/browser/ui/views/ash/screenshot_taker.h index d3d2a68..593e3f7 100644 --- a/chrome/browser/ui/views/ash/screenshot_taker.h +++ b/chrome/browser/ui/views/ash/screenshot_taker.h @@ -9,7 +9,7 @@ #include "ash/screenshot_delegate.h" #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" namespace aura { class Window; diff --git a/chrome/browser/ui/views/ash/window_positioner.cc b/chrome/browser/ui/views/ash/window_positioner.cc index 42d9fe9..ad6c4c6 100644 --- a/chrome/browser/ui/views/ash/window_positioner.cc +++ b/chrome/browser/ui/views/ash/window_positioner.cc @@ -10,7 +10,7 @@ #include "ash/wm/window_util.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/gfx/screen.h" WindowPositioner::WindowPositioner() diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc index 49e9eb9..5cd0a2f 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc @@ -13,8 +13,8 @@ #include "chrome/common/extensions/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/layer.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/layout/layout_constants.h" diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc index 34e6811..db807d5 100644 --- a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc +++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc @@ -9,19 +9,19 @@ #include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "grit/generated_resources.h" // Accessibility names -#include "grit/ui_resources.h" -#include "grit/ui_resources_standard.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" +#include "grit/ui_resources.h" +#include "grit/ui_resources_standard.h" #include "ui/aura/window.h" #include "ui/base/animation/slide_animation.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/hit_test.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/image/image.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc index e36263e..0869af4 100644 --- a/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc +++ b/chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc @@ -25,7 +25,7 @@ #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/ime/text_input_type.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/gfx/screen.h" #include "ui/views/controls/webview/webview.h" #include "ui/views/ime/text_input_type_tracker.h" diff --git a/chrome/browser/ui/window_snapshot/window_snapshot_aura.cc b/chrome/browser/ui/window_snapshot/window_snapshot_aura.cc index d17cb60..aa84adc 100644 --- a/chrome/browser/ui/window_snapshot/window_snapshot_aura.cc +++ b/chrome/browser/ui/window_snapshot/window_snapshot_aura.cc @@ -7,9 +7,9 @@ #include "base/logging.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/aura/window.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/layer.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/layer.h" #include "ui/gfx/rect.h" namespace browser { diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 9043658..78ea45a 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -4325,7 +4325,7 @@ ], 'dependencies': [ '../ui/aura/aura.gyp:aura', - '../ui/gfx/compositor/compositor.gyp:compositor', + '../ui/compositor/compositor.gyp:compositor', ], }], ['ui_compositor_image_transport==1', { diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index c926dc4..ccd025c 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -50,7 +50,7 @@ 'conditions': [ ['use_aura==1', { 'dependencies': [ - '../ui/gfx/compositor/compositor.gyp:compositor', + '../ui/compositor/compositor.gyp:compositor', ], }], ['OS=="win"', { diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index f4f4b04..9ecd301 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -65,7 +65,7 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', - '../ui/gfx/compositor/compositor.gyp:compositor_test_support', + '../ui/compositor/compositor.gyp:compositor_test_support', ], 'export_dependent_settings': [ 'renderer', diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc index b0dd7e2..ea3de1b 100644 --- a/chrome/test/base/chrome_test_suite.cc +++ b/chrome/test/base/chrome_test_suite.cc @@ -39,7 +39,7 @@ #include "base/shared_memory.h" #endif -#include "ui/gfx/compositor/compositor_setup.h" +#include "ui/compositor/compositor_setup.h" namespace { diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index 75146ed..d0a147c 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -39,7 +39,7 @@ #include "content/test/test_launcher.h" #include "net/base/mock_host_resolver.h" #include "net/test/test_server.h" -#include "ui/gfx/compositor/compositor_switches.h" +#include "ui/compositor/compositor_switches.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/audio/audio_handler.h" diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc index 4d51438..cab4dae 100644 --- a/chrome/test/base/view_event_test_base.cc +++ b/chrome/test/base/view_event_test_base.cc @@ -10,7 +10,7 @@ #include "base/string_number_conversions.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_thread.h" -#include "ui/gfx/compositor/test/compositor_test_support.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/ui_controls/ui_controls.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index 8acbd22..e9269f1 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -26,8 +26,8 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" +#include "ui/compositor/compositor_setup.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/compositor/compositor_setup.h" #include "ui/gfx/gl/gl_switches.h" #include "ui/gfx/size.h" diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index eb2dffa..36e70ef 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -57,7 +57,7 @@ #endif #if defined(USE_AURA) -#include "ui/gfx/compositor/compositor_switches.h" +#include "ui/compositor/compositor_switches.h" #endif using base::Time; diff --git a/content/DEPS b/content/DEPS index 8936498..79aa707 100644 --- a/content/DEPS +++ b/content/DEPS @@ -52,6 +52,7 @@ include_rules = [ # Aura is analogous to Win32 or a Gtk, so it is allowed. "+ui/aura", "+ui/base", + "+ui/compositor", "+ui/gfx", "+ui/surface", # Content knows about grd files, but the specifics of how to get a resource @@ -63,9 +64,9 @@ include_rules = [ # Content shouldn't depend on views. While we technically don't need this # line, since the top level DEPS doesn't allow it, we add it to make this - # explicit. + # explicit. "-views", - + # Aura Shell consumes views, so it too is banned. "-ui/aura_shell", diff --git a/content/browser/renderer_host/image_transport_client.h b/content/browser/renderer_host/image_transport_client.h index 0f01e0a..b18ea2f 100644 --- a/content/browser/renderer_host/image_transport_client.h +++ b/content/browser/renderer_host/image_transport_client.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "ui/gfx/compositor/compositor.h" +#include "ui/compositor/compositor.h" #include "ui/surface/transport_dib.h" namespace gfx { diff --git a/content/browser/renderer_host/image_transport_factory.cc b/content/browser/renderer_host/image_transport_factory.cc index 3909606..9fb5fbc 100644 --- a/content/browser/renderer_host/image_transport_factory.cc +++ b/content/browser/renderer_host/image_transport_factory.cc @@ -11,8 +11,8 @@ #include "base/command_line.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" -#include "content/browser/gpu/gpu_surface_tracker.h" #include "content/browser/gpu/browser_gpu_channel_host_factory.h" +#include "content/browser/gpu/gpu_surface_tracker.h" #include "content/browser/renderer_host/image_transport_client.h" #include "content/common/gpu/client/gpu_channel_host.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" @@ -20,8 +20,8 @@ #include "content/public/common/content_switches.h" #include "gpu/ipc/command_buffer_proxy.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/compositor_setup.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/compositor_setup.h" #include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_surface.h" #include "ui/gfx/gl/scoped_make_current.h" diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 6850ebd..8f16ab9 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -32,9 +32,9 @@ #include "ui/base/hit_test.h" #include "ui/base/ime/input_method.h" #include "ui/base/ui_base_types.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/layer.h" #include "ui/gfx/monitor.h" #include "ui/gfx/screen.h" #include "ui/gfx/skia_util.h" diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h index 3c4814e..15857e8 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.h +++ b/content/browser/renderer_host/render_widget_host_view_aura.h @@ -18,7 +18,7 @@ #include "ui/aura/client/activation_delegate.h" #include "ui/aura/window_delegate.h" #include "ui/base/ime/text_input_client.h" -#include "ui/gfx/compositor/compositor_observer.h" +#include "ui/compositor/compositor_observer.h" #include "ui/gfx/rect.h" #include "webkit/glue/webcursor.h" diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index 0578572..d525cdf 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc @@ -24,7 +24,7 @@ #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" #include "ui/base/hit_test.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/gfx/screen.h" #include "webkit/glue/webdropdata.h" diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 62df23b..36ab74e 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -851,7 +851,7 @@ ['use_aura==1', { 'dependencies': [ '../ui/aura/aura.gyp:aura', - '../ui/gfx/compositor/compositor.gyp:compositor', + '../ui/compositor/compositor.gyp:compositor', ], 'sources/': [ ['exclude', '^browser/accessibility/browser_accessibility_manager_win.cc'], diff --git a/content/content_tests.gypi b/content/content_tests.gypi index ec44c8c..5b828fd 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -157,7 +157,7 @@ ['use_aura==1', { 'dependencies': [ '../ui/aura/aura.gyp:test_support_aura', - '../ui/gfx/compositor/compositor.gyp:compositor', + '../ui/compositor/compositor.gyp:compositor', ], }], ], diff --git a/content/test/content_test_suite.cc b/content/test/content_test_suite.cc index 657415a..9c018e9 100644 --- a/content/test/content_test_suite.cc +++ b/content/test/content_test_suite.cc @@ -17,7 +17,7 @@ #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" #endif -#include "ui/gfx/compositor/compositor_setup.h" +#include "ui/compositor/compositor_setup.h" namespace { diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp index d3cc00b..a8e898f 100644 --- a/ui/aura/aura.gyp +++ b/ui/aura/aura.gyp @@ -15,7 +15,7 @@ '../../base/base.gyp:base_i18n', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../../skia/skia.gyp:skia', - '../gfx/compositor/compositor.gyp:compositor', + '../compositor/compositor.gyp:compositor', '../ui.gyp:gfx_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -168,8 +168,8 @@ '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', - '../gfx/compositor/compositor.gyp:compositor', - '../gfx/compositor/compositor.gyp:compositor_test_support', + '../compositor/compositor.gyp:compositor', + '../compositor/compositor.gyp:compositor_test_support', '../ui.gyp:gfx_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -192,8 +192,8 @@ '../../chrome/chrome_resources.gyp:packed_resources', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', - '../gfx/compositor/compositor.gyp:compositor_test_support', - '../gfx/compositor/compositor.gyp:compositor', + '../compositor/compositor.gyp:compositor_test_support', + '../compositor/compositor.gyp:compositor', '../gfx/gl/gl.gyp:gl', '../ui.gyp:gfx_resources', '../ui.gyp:ui', diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc index c4782b0..78343f9 100644 --- a/ui/aura/demo/demo_main.cc +++ b/ui/aura/demo/demo_main.cc @@ -11,15 +11,15 @@ #include "ui/aura/client/stacking_client.h" #include "ui/aura/env.h" #include "ui/aura/event.h" -#include "ui/aura/single_monitor_manager.h" #include "ui/aura/root_window.h" +#include "ui/aura/single_monitor_manager.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" #include "ui/base/hit_test.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/test/compositor_test_support.h" #include "ui/gfx/rect.h" #if defined(USE_X11) diff --git a/ui/aura/env.cc b/ui/aura/env.cc index 747c74c..3a31e66 100644 --- a/ui/aura/env.cc +++ b/ui/aura/env.cc @@ -7,7 +7,7 @@ #include "ui/aura/monitor_manager.h" #include "ui/aura/root_window_host.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/compositor.h" +#include "ui/compositor/compositor.h" #if defined(USE_X11) #include "ui/aura/monitor_change_observer_x11.h" diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc index aeb3651..8481d40 100644 --- a/ui/aura/root_window.cc +++ b/ui/aura/root_window.cc @@ -25,9 +25,9 @@ #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/gestures/gesture_types.h" #include "ui/base/hit_test.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animator.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animator.h" using std::vector; diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h index 94ec02f..9298bb4 100644 --- a/ui/aura/root_window.h +++ b/ui/aura/root_window.h @@ -19,9 +19,9 @@ #include "ui/base/events.h" #include "ui/base/gestures/gesture_recognizer.h" #include "ui/base/gestures/gesture_types.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/compositor_observer.h" -#include "ui/gfx/compositor/layer_animation_observer.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/compositor_observer.h" +#include "ui/compositor/layer_animation_observer.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/point.h" diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc index 1b56bb0..6241991 100644 --- a/ui/aura/root_window_host_linux.cc +++ b/ui/aura/root_window_host_linux.cc @@ -26,9 +26,8 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/touch/touch_factory.h" -#include "ui/base/x/x11_util.h" #include "ui/base/view_prop.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/gfx/image/image.h" using std::max; diff --git a/ui/aura/root_window_view_mac.h b/ui/aura/root_window_view_mac.h index 53eca8a..a49ef32 100644 --- a/ui/aura/root_window_view_mac.h +++ b/ui/aura/root_window_view_mac.h @@ -8,7 +8,7 @@ #import <Cocoa/Cocoa.h> -#include "ui/gfx/compositor/compositor.h" +#include "ui/compositor/compositor.h" // RootWindowView provides an NSView class that delegates drawing to a // ui::Compositor delegate, setting up the NSOpenGLContext as required. diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc index dd3f73a..f381689 100644 --- a/ui/aura/test/aura_test_helper.cc +++ b/ui/aura/test/aura_test_helper.cc @@ -6,7 +6,7 @@ #include "ui/aura/env.h" #include "ui/aura/root_window.h" -#include "ui/gfx/compositor/layer_animator.h" +#include "ui/compositor/layer_animator.h" namespace aura { namespace test { diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc index a9c9cb9..349b465 100644 --- a/ui/aura/test/test_suite.cc +++ b/ui/aura/test/test_suite.cc @@ -9,8 +9,8 @@ #include "build/build_config.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" -#include "ui/gfx/compositor/compositor_setup.h" -#include "ui/gfx/compositor/test/compositor_test_support.h" +#include "ui/compositor/compositor_setup.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/gfx/gfx_paths.h" #include "ui/gfx/gl/gl_implementation.h" diff --git a/ui/aura/test/test_windows.cc b/ui/aura/test/test_windows.cc index 682fd54..085846d 100644 --- a/ui/aura/test/test_windows.cc +++ b/ui/aura/test/test_windows.cc @@ -6,7 +6,7 @@ #include "base/string_number_conversions.h" #include "ui/aura/window.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/gfx/rect.h" namespace aura { diff --git a/ui/aura/window.cc b/ui/aura/window.cc index 9ad84a3..43e8e08ba 100644 --- a/ui/aura/window.cc +++ b/ui/aura/window.cc @@ -22,9 +22,9 @@ #include "ui/aura/window_delegate.h" #include "ui/aura/window_observer.h" #include "ui/base/animation/multi_animation.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/layer.h" #include "ui/gfx/screen.h" namespace aura { diff --git a/ui/aura/window.h b/ui/aura/window.h index c8e46a6..f3e8528 100644 --- a/ui/aura/window.h +++ b/ui/aura/window.h @@ -14,13 +14,13 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/string16.h" -#include "ui/base/events.h" #include "ui/aura/aura_export.h" #include "ui/aura/client/window_types.h" +#include "ui/base/events.h" #include "ui/base/gestures/gesture_types.h" -#include "ui/gfx/compositor/layer_animator.h" -#include "ui/gfx/compositor/layer_delegate.h" -#include "ui/gfx/compositor/layer_type.h" +#include "ui/compositor/layer_animator.h" +#include "ui/compositor/layer_delegate.h" +#include "ui/compositor/layer_type.h" #include "ui/gfx/insets.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc index 5a011d4..4872373 100644 --- a/ui/aura/window_unittest.cc +++ b/ui/aura/window_unittest.cc @@ -24,9 +24,9 @@ #include "ui/aura/window_property.h" #include "ui/base/hit_test.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" #include "ui/gfx/screen.h" DECLARE_WINDOW_PROPERTY_TYPE(const char*) diff --git a/ui/gfx/compositor/DEPS b/ui/compositor/DEPS index b37b8c6..b37b8c6 100644 --- a/ui/gfx/compositor/DEPS +++ b/ui/compositor/DEPS diff --git a/ui/gfx/compositor/OWNERS b/ui/compositor/OWNERS index 81249d4..81249d4 100644 --- a/ui/gfx/compositor/OWNERS +++ b/ui/compositor/OWNERS diff --git a/ui/gfx/compositor/PRESUBMIT.py b/ui/compositor/PRESUBMIT.py index 8311e1c..8311e1c 100644 --- a/ui/gfx/compositor/PRESUBMIT.py +++ b/ui/compositor/PRESUBMIT.py diff --git a/ui/gfx/compositor/compositor.cc b/ui/compositor/compositor.cc index 3a8942a..8c9b1bd 100644 --- a/ui/gfx/compositor/compositor.cc +++ b/ui/compositor/compositor.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/compositor.h" +#include "ui/compositor/compositor.h" #include "base/command_line.h" #include "base/threading/thread_restrictions.h" @@ -12,10 +12,10 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/images/SkImageEncoder.h" -#include "ui/gfx/compositor/compositor_observer.h" -#include "ui/gfx/compositor/compositor_switches.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/test_web_graphics_context_3d.h" +#include "ui/compositor/compositor_observer.h" +#include "ui/compositor/compositor_switches.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/test_web_graphics_context_3d.h" #include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_implementation.h" #include "ui/gfx/gl/gl_surface.h" diff --git a/ui/gfx/compositor/compositor.gyp b/ui/compositor/compositor.gyp index d53f1f2..d53f1f2 100644 --- a/ui/gfx/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp diff --git a/ui/gfx/compositor/compositor.h b/ui/compositor/compositor.h index 9475cf6..2bb4083 100644 --- a/ui/gfx/compositor/compositor.h +++ b/ui/compositor/compositor.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_COMPOSITOR_H_ -#define UI_GFX_COMPOSITOR_COMPOSITOR_H_ +#ifndef UI_COMPOSITOR_COMPOSITOR_H_ +#define UI_COMPOSITOR_COMPOSITOR_H_ #pragma once #include "base/hash_tables.h" @@ -12,14 +12,14 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h" -#include "ui/gfx/compositor/compositor_export.h" +#include "ui/compositor/compositor_export.h" #include "ui/gfx/gl/gl_share_group.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" #include "ui/gfx/transform.h" - class SkBitmap; + namespace gfx { class GLContext; class GLSurface; @@ -213,6 +213,8 @@ class COMPOSITOR_EXPORT Compositor virtual void scheduleComposite(); private: + friend class base::RefCounted<Compositor>; + // When reading back pixel data we often get RGBA rather than BGRA pixels and // and the image often needs to be flipped vertically. static void SwizzleRGBAToBGRAAndFlip(unsigned char* pixels, @@ -236,10 +238,8 @@ class COMPOSITOR_EXPORT Compositor // This is set to true when the swap buffers has been posted and we're waiting // for completion. bool swap_posted_; - - friend class base::RefCounted<Compositor>; }; } // namespace ui -#endif // UI_GFX_COMPOSITOR_COMPOSITOR_H_ +#endif // UI_COMPOSITOR_COMPOSITOR_H_ diff --git a/ui/gfx/compositor/compositor_export.h b/ui/compositor/compositor_export.h index 2b1440b..7142e17 100644 --- a/ui/gfx/compositor/compositor_export.h +++ b/ui/compositor/compositor_export.h @@ -1,9 +1,9 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. -#ifndef UI_GFX_COMPOSITOR_COMPOSITOR_EXPORT_H_ -#define UI_GFX_COMPOSITOR_COMPOSITOR_EXPORT_H_ +#ifndef UI_COMPOSITOR_COMPOSITOR_EXPORT_H_ +#define UI_COMPOSITOR_COMPOSITOR_EXPORT_H_ #pragma once #if defined(COMPONENT_BUILD) @@ -23,4 +23,4 @@ #define COMPOSITOR_EXPORT #endif -#endif // UI_GFX_COMPOSITOR_COMPOSITOR_EXPORT_H_ +#endif // UI_COMPOSITOR_COMPOSITOR_EXPORT_H_ diff --git a/ui/gfx/compositor/compositor_observer.h b/ui/compositor/compositor_observer.h index 1d4bf7da3..e460101 100644 --- a/ui/gfx/compositor/compositor_observer.h +++ b/ui/compositor/compositor_observer.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_COMPOSITOR_OBSERVER_H_ -#define UI_GFX_COMPOSITOR_COMPOSITOR_OBSERVER_H_ +#ifndef UI_COMPOSITOR_COMPOSITOR_OBSERVER_H_ +#define UI_COMPOSITOR_COMPOSITOR_OBSERVER_H_ #pragma once -#include "ui/gfx/compositor/compositor_export.h" +#include "ui/compositor/compositor_export.h" namespace ui { @@ -28,4 +28,4 @@ class COMPOSITOR_EXPORT CompositorObserver { } // namespace ui -#endif // UI_GFX_COMPOSITOR_COMPOSITOR_OBSERVER_H_ +#endif // UI_COMPOSITOR_COMPOSITOR_OBSERVER_H_ diff --git a/ui/gfx/compositor/compositor_setup.h b/ui/compositor/compositor_setup.h index 1f59d86..a1e3935 100644 --- a/ui/gfx/compositor/compositor_setup.h +++ b/ui/compositor/compositor_setup.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_COMPOSITOR_SETUP_H_ -#define UI_GFX_COMPOSITOR_COMPOSITOR_SETUP_H_ +#ifndef UI_COMPOSITOR_COMPOSITOR_SETUP_H_ +#define UI_COMPOSITOR_COMPOSITOR_SETUP_H_ #pragma once -#include "ui/gfx/compositor/compositor_export.h" +#include "ui/compositor/compositor_export.h" namespace ui { @@ -27,4 +27,4 @@ COMPOSITOR_EXPORT bool IsTestCompositorEnabled(); } // namespace ui -#endif // UI_GFX_COMPOSITOR_COMPOSITOR_SETUP_H_ +#endif // UI_COMPOSITOR_COMPOSITOR_SETUP_H_ diff --git a/ui/gfx/compositor/compositor_switches.cc b/ui/compositor/compositor_switches.cc index 058f11a..b3dbb2d 100644 --- a/ui/gfx/compositor/compositor_switches.cc +++ b/ui/compositor/compositor_switches.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/compositor_switches.h" +#include "ui/compositor/compositor_switches.h" namespace switches { diff --git a/ui/gfx/compositor/compositor_switches.h b/ui/compositor/compositor_switches.h index 279128c..a8f9c8f 100644 --- a/ui/gfx/compositor/compositor_switches.h +++ b/ui/compositor/compositor_switches.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_COMPOSITOR_SWITCHES_H_ -#define UI_GFX_COMPOSITOR_COMPOSITOR_SWITCHES_H_ +#ifndef UI_COMPOSITOR_COMPOSITOR_SWITCHES_H_ +#define UI_COMPOSITOR_COMPOSITOR_SWITCHES_H_ #pragma once -#include "ui/gfx/compositor/compositor_export.h" +#include "ui/compositor/compositor_export.h" namespace switches { @@ -20,4 +20,4 @@ COMPOSITOR_EXPORT extern const char kUIEnablePerTilePainting[]; } // namespace switches -#endif // UI_GFX_COMPOSITOR_COMPOSITOR_SWITCHES_H_ +#endif // UI_COMPOSITOR_COMPOSITOR_SWITCHES_H_ diff --git a/ui/gfx/compositor/debug_utils.cc b/ui/compositor/debug_utils.cc index 2908749..fa6c101 100644 --- a/ui/gfx/compositor/debug_utils.cc +++ b/ui/compositor/debug_utils.cc @@ -4,7 +4,7 @@ #ifndef NDEBUG -#include "ui/gfx/compositor/debug_utils.h" +#include "ui/compositor/debug_utils.h" #include <iomanip> #include <iostream> @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include "ui/gfx/interpolated_transform.h" #include "ui/gfx/point.h" #include "ui/gfx/transform.h" diff --git a/ui/gfx/compositor/debug_utils.h b/ui/compositor/debug_utils.h index dc131d6..a07d3d3 100644 --- a/ui/gfx/compositor/debug_utils.h +++ b/ui/compositor/debug_utils.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_DEBUG_UTILS_H_ -#define UI_GFX_COMPOSITOR_DEBUG_UTILS_H_ +#ifndef UI_COMPOSITOR_DEBUG_UTILS_H_ +#define UI_COMPOSITOR_DEBUG_UTILS_H_ #pragma once #ifndef NDEBUG -#include "ui/gfx/compositor/compositor_export.h" +#include "ui/compositor/compositor_export.h" namespace gfx { class Point; @@ -26,4 +26,4 @@ COMPOSITOR_EXPORT void PrintLayerHierarchy(const Layer* layer, #endif // NDEBUG -#endif // UI_GFX_COMPOSITOR_DEBUG_UTILS_H_ +#endif // UI_COMPOSITOR_DEBUG_UTILS_H_ diff --git a/ui/gfx/compositor/layer.cc b/ui/compositor/layer.cc index 398ecc9..faba3db 100644 --- a/ui/gfx/compositor/layer.cc +++ b/ui/compositor/layer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/layer.h" #include <algorithm> @@ -19,9 +19,9 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebSolidColorLayer.h" #include "ui/base/animation/animation.h" +#include "ui/compositor/compositor_switches.h" +#include "ui/compositor/layer_animator.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/compositor_switches.h" -#include "ui/gfx/compositor/layer_animator.h" #include "ui/gfx/interpolated_transform.h" #include "ui/gfx/point3.h" diff --git a/ui/gfx/compositor/layer.h b/ui/compositor/layer.h index 77237d2..e74d553 100644 --- a/ui/gfx/compositor/layer.h +++ b/ui/compositor/layer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_LAYER_H_ -#define UI_GFX_COMPOSITOR_LAYER_H_ +#ifndef UI_COMPOSITOR_LAYER_H_ +#define UI_COMPOSITOR_LAYER_H_ #pragma once #include <string> @@ -13,16 +13,16 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "third_party/skia/include/core/SkColor.h" -#include "third_party/skia/include/core/SkRegion.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayerClient.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h" +#include "third_party/skia/include/core/SkColor.h" +#include "third_party/skia/include/core/SkRegion.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/layer_animation_delegate.h" +#include "ui/compositor/layer_delegate.h" +#include "ui/compositor/layer_type.h" #include "ui/gfx/rect.h" #include "ui/gfx/transform.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/layer_animation_delegate.h" -#include "ui/gfx/compositor/layer_delegate.h" -#include "ui/gfx/compositor/layer_type.h" class SkCanvas; @@ -298,4 +298,4 @@ class COMPOSITOR_EXPORT Layer : } // namespace ui -#endif // UI_GFX_COMPOSITOR_LAYER_H_ +#endif // UI_COMPOSITOR_LAYER_H_ diff --git a/ui/gfx/compositor/layer_animation_delegate.h b/ui/compositor/layer_animation_delegate.h index 8470348..e5a3c30 100644 --- a/ui/gfx/compositor/layer_animation_delegate.h +++ b/ui/compositor/layer_animation_delegate.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_LAYER_ANIMATION_DELEGATE_H_ -#define UI_GFX_COMPOSITOR_LAYER_ANIMATION_DELEGATE_H_ +#ifndef UI_COMPOSITOR_LAYER_ANIMATION_DELEGATE_H_ +#define UI_COMPOSITOR_LAYER_ANIMATION_DELEGATE_H_ #pragma once +#include "ui/compositor/compositor_export.h" #include "ui/gfx/rect.h" #include "ui/gfx/transform.h" -#include "ui/gfx/compositor/compositor_export.h" namespace ui { @@ -31,4 +31,4 @@ class COMPOSITOR_EXPORT LayerAnimationDelegate { } // namespace ui -#endif // UI_GFX_COMPOSITOR_LAYER_ANIMATION_DELEGATE_H_ +#endif // UI_COMPOSITOR_LAYER_ANIMATION_DELEGATE_H_ diff --git a/ui/gfx/compositor/layer_animation_element.cc b/ui/compositor/layer_animation_element.cc index 9fcb843..b5ebc03 100644 --- a/ui/gfx/compositor/layer_animation_element.cc +++ b/ui/compositor/layer_animation_element.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/layer_animation_element.h" +#include "ui/compositor/layer_animation_element.h" #include "base/compiler_specific.h" #include "ui/base/animation/tween.h" -#include "ui/gfx/compositor/layer_animation_delegate.h" -#include "ui/gfx/compositor/layer_animator.h" +#include "ui/compositor/layer_animation_delegate.h" +#include "ui/compositor/layer_animator.h" #include "ui/gfx/interpolated_transform.h" namespace ui { diff --git a/ui/gfx/compositor/layer_animation_element.h b/ui/compositor/layer_animation_element.h index 798772f1..419ee93 100644 --- a/ui/gfx/compositor/layer_animation_element.h +++ b/ui/compositor/layer_animation_element.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ -#define UI_GFX_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ +#ifndef UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ +#define UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ #pragma once #include <set> #include "base/time.h" #include "ui/base/animation/tween.h" -#include "ui/gfx/compositor/compositor_export.h" +#include "ui/compositor/compositor_export.h" #include "ui/gfx/rect.h" #include "ui/gfx/transform.h" @@ -131,4 +131,4 @@ class COMPOSITOR_EXPORT LayerAnimationElement { } // namespace ui -#endif // UI_GFX_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ +#endif // UI_COMPOSITOR_LAYER_ANIMATION_ELEMENT_H_ diff --git a/ui/gfx/compositor/layer_animation_element_unittest.cc b/ui/compositor/layer_animation_element_unittest.cc index d6287b0..7aadab7 100644 --- a/ui/gfx/compositor/layer_animation_element_unittest.cc +++ b/ui/compositor/layer_animation_element_unittest.cc @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/layer_animation_element.h" +#include "ui/compositor/layer_animation_element.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/compositor/layer_animation_delegate.h" +#include "ui/compositor/test/test_layer_animation_delegate.h" +#include "ui/compositor/test/test_utils.h" #include "ui/gfx/rect.h" #include "ui/gfx/transform.h" -#include "ui/gfx/compositor/layer_animation_delegate.h" -#include "ui/gfx/compositor/test/test_layer_animation_delegate.h" -#include "ui/gfx/compositor/test/test_utils.h" namespace ui { diff --git a/ui/gfx/compositor/layer_animation_observer.cc b/ui/compositor/layer_animation_observer.cc index 5e1c0ed..b41676a 100644 --- a/ui/gfx/compositor/layer_animation_observer.cc +++ b/ui/compositor/layer_animation_observer.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/layer_animation_observer.h" +#include "ui/compositor/layer_animation_observer.h" -#include "ui/gfx/compositor/layer_animation_sequence.h" +#include "ui/compositor/layer_animation_sequence.h" namespace ui { diff --git a/ui/gfx/compositor/layer_animation_observer.h b/ui/compositor/layer_animation_observer.h index 8b0df8e..abc8155 100644 --- a/ui/gfx/compositor/layer_animation_observer.h +++ b/ui/compositor/layer_animation_observer.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_ -#define UI_GFX_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_ +#ifndef UI_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_ +#define UI_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_ #pragma once #include <set> #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "ui/gfx/compositor/compositor_export.h" +#include "ui/compositor/compositor_export.h" namespace ui { @@ -116,4 +116,4 @@ class COMPOSITOR_EXPORT ImplicitAnimationObserver } // namespace ui -#endif // UI_GFX_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_ +#endif // UI_COMPOSITOR_LAYER_ANIMATION_OBSERVER_H_ diff --git a/ui/gfx/compositor/layer_animation_sequence.cc b/ui/compositor/layer_animation_sequence.cc index aff8e8c..646c5f1 100644 --- a/ui/gfx/compositor/layer_animation_sequence.cc +++ b/ui/compositor/layer_animation_sequence.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/layer_animation_sequence.h" +#include "ui/compositor/layer_animation_sequence.h" #include <algorithm> #include <iterator> #include "base/debug/trace_event.h" -#include "ui/gfx/compositor/layer_animation_delegate.h" -#include "ui/gfx/compositor/layer_animation_element.h" -#include "ui/gfx/compositor/layer_animation_observer.h" +#include "ui/compositor/layer_animation_delegate.h" +#include "ui/compositor/layer_animation_element.h" +#include "ui/compositor/layer_animation_observer.h" namespace ui { diff --git a/ui/gfx/compositor/layer_animation_sequence.h b/ui/compositor/layer_animation_sequence.h index dc85721..9e4b5d2 100644 --- a/ui/gfx/compositor/layer_animation_sequence.h +++ b/ui/compositor/layer_animation_sequence.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_LAYER_ANIMATION_SEQUENCE_H_ -#define UI_GFX_COMPOSITOR_LAYER_ANIMATION_SEQUENCE_H_ +#ifndef UI_COMPOSITOR_LAYER_ANIMATION_SEQUENCE_H_ +#define UI_COMPOSITOR_LAYER_ANIMATION_SEQUENCE_H_ #pragma once #include <vector> @@ -12,8 +12,8 @@ #include "base/memory/linked_ptr.h" #include "base/observer_list.h" #include "base/time.h" -#include "ui/gfx/compositor/compositor_export.h" -#include "ui/gfx/compositor/layer_animation_element.h" +#include "ui/compositor/compositor_export.h" +#include "ui/compositor/layer_animation_element.h" namespace ui { @@ -121,4 +121,4 @@ class COMPOSITOR_EXPORT LayerAnimationSequence { } // namespace ui -#endif // UI_GFX_COMPOSITOR_LAYER_ANIMATION_SEQUENCE_H_ +#endif // UI_COMPOSITOR_LAYER_ANIMATION_SEQUENCE_H_ diff --git a/ui/gfx/compositor/layer_animation_sequence_unittest.cc b/ui/compositor/layer_animation_sequence_unittest.cc index f928d37..fa31967 100644 --- a/ui/gfx/compositor/layer_animation_sequence_unittest.cc +++ b/ui/compositor/layer_animation_sequence_unittest.cc @@ -1,21 +1,21 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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 "ui/gfx/compositor/layer_animation_sequence.h" +#include "ui/compositor/layer_animation_sequence.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/compositor/layer_animation_delegate.h" +#include "ui/compositor/layer_animation_element.h" +#include "ui/compositor/test/test_layer_animation_delegate.h" +#include "ui/compositor/test/test_layer_animation_observer.h" +#include "ui/compositor/test/test_utils.h" #include "ui/gfx/rect.h" #include "ui/gfx/transform.h" -#include "ui/gfx/compositor/layer_animation_delegate.h" -#include "ui/gfx/compositor/layer_animation_element.h" -#include "ui/gfx/compositor/test/test_layer_animation_delegate.h" -#include "ui/gfx/compositor/test/test_layer_animation_observer.h" -#include "ui/gfx/compositor/test/test_utils.h" namespace ui { diff --git a/ui/gfx/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc index df70518..712cd2b2 100644 --- a/ui/gfx/compositor/layer_animator.cc +++ b/ui/compositor/layer_animator.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/layer_animator.h" +#include "ui/compositor/layer_animator.h" #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "ui/base/animation/animation_container.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animation_delegate.h" -#include "ui/gfx/compositor/layer_animation_observer.h" -#include "ui/gfx/compositor/layer_animation_sequence.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animation_delegate.h" +#include "ui/compositor/layer_animation_observer.h" +#include "ui/compositor/layer_animation_sequence.h" namespace ui { diff --git a/ui/gfx/compositor/layer_animator.h b/ui/compositor/layer_animator.h index 070534a..4c8a15e 100644 --- a/ui/gfx/compositor/layer_animator.h +++ b/ui/compositor/layer_animator.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_LAYER_ANIMATOR_H_ -#define UI_GFX_COMPOSITOR_LAYER_ANIMATOR_H_ +#ifndef UI_COMPOSITOR_LAYER_ANIMATOR_H_ +#define UI_COMPOSITOR_LAYER_ANIMATOR_H_ #pragma once #include <deque> @@ -16,8 +16,8 @@ #include "base/time.h" #include "ui/base/animation/animation_container_element.h" #include "ui/base/animation/tween.h" -#include "ui/gfx/compositor/compositor_export.h" -#include "ui/gfx/compositor/layer_animation_element.h" +#include "ui/compositor/compositor_export.h" +#include "ui/compositor/layer_animation_element.h" namespace gfx { class Rect; @@ -281,4 +281,4 @@ class COMPOSITOR_EXPORT LayerAnimator : public AnimationContainerElement { } // namespace ui -#endif // UI_GFX_COMPOSITOR_LAYER_ANIMATOR_H_ +#endif // UI_COMPOSITOR_LAYER_ANIMATOR_H_ diff --git a/ui/gfx/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc index 2ad34c3..b2cade2 100644 --- a/ui/gfx/compositor/layer_animator_unittest.cc +++ b/ui/compositor/layer_animator_unittest.cc @@ -2,22 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/layer_animator.h" +#include "ui/compositor/layer_animator.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/time.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/compositor/layer_animation_delegate.h" +#include "ui/compositor/layer_animation_element.h" +#include "ui/compositor/layer_animation_sequence.h" +#include "ui/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/test/test_layer_animation_delegate.h" +#include "ui/compositor/test/test_layer_animation_observer.h" +#include "ui/compositor/test/test_utils.h" #include "ui/gfx/rect.h" #include "ui/gfx/transform.h" -#include "ui/gfx/compositor/layer_animation_delegate.h" -#include "ui/gfx/compositor/layer_animation_element.h" -#include "ui/gfx/compositor/layer_animation_sequence.h" -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" -#include "ui/gfx/compositor/test/test_layer_animation_delegate.h" -#include "ui/gfx/compositor/test/test_layer_animation_observer.h" -#include "ui/gfx/compositor/test/test_utils.h" namespace ui { diff --git a/ui/gfx/compositor/layer_delegate.h b/ui/compositor/layer_delegate.h index 1f494b1..292e399 100644 --- a/ui/gfx/compositor/layer_delegate.h +++ b/ui/compositor/layer_delegate.h @@ -1,12 +1,12 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. -#ifndef UI_GFX_COMPOSITOR_LAYER_DELEGATE_H_ -#define UI_GFX_COMPOSITOR_LAYER_DELEGATE_H_ +#ifndef UI_COMPOSITOR_LAYER_DELEGATE_H_ +#define UI_COMPOSITOR_LAYER_DELEGATE_H_ #pragma once -#include "ui/gfx/compositor/compositor_export.h" +#include "ui/compositor/compositor_export.h" namespace gfx { class Canvas; @@ -27,4 +27,4 @@ class COMPOSITOR_EXPORT LayerDelegate { } // namespace ui -#endif // UI_GFX_COMPOSITOR_LAYER_DELEGATE_H_ +#endif // UI_COMPOSITOR_LAYER_DELEGATE_H_ diff --git a/ui/gfx/compositor/layer_type.h b/ui/compositor/layer_type.h index 94bb82d..b22eb2b 100644 --- a/ui/gfx/compositor/layer_type.h +++ b/ui/compositor/layer_type.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_LAYER_TYPE_H_ -#define UI_GFX_COMPOSITOR_LAYER_TYPE_H_ +#ifndef UI_COMPOSITOR_LAYER_TYPE_H_ +#define UI_COMPOSITOR_LAYER_TYPE_H_ #pragma once namespace ui { @@ -20,6 +20,6 @@ enum LayerType { LAYER_SOLID_COLOR = 2, }; -} // namespace +} // namespace ui -#endif // UI_GFX_COMPOSITOR_LAYER_TYPE_H_ +#endif // UI_COMPOSITOR_LAYER_TYPE_H_ diff --git a/ui/gfx/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc index 65805fd..3af990d 100644 --- a/ui/gfx/compositor/layer_unittest.cc +++ b/ui/compositor/layer_unittest.cc @@ -10,16 +10,16 @@ #include "base/path_service.h" #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/compositor/compositor_observer.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animation_sequence.h" +#include "ui/compositor/test/test_compositor_host.h" #include "ui/gfx/canvas.h" #include "ui/gfx/codec/png_codec.h" -#include "ui/gfx/compositor/compositor_observer.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animation_sequence.h" -#include "ui/gfx/compositor/test/test_compositor_host.h" #include "ui/gfx/gfx_paths.h" #include "ui/gfx/skia_util.h" -#include "ui/gfx/compositor/compositor_setup.h" +#include "ui/compositor/compositor_setup.h" namespace ui { diff --git a/ui/gfx/compositor/run_all_unittests.cc b/ui/compositor/run_all_unittests.cc index 3665c79..4c3f006 100644 --- a/ui/gfx/compositor/run_all_unittests.cc +++ b/ui/compositor/run_all_unittests.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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 "ui/gfx/compositor/test/test_suite.h" +#include "ui/compositor/test/test_suite.h" int main(int argc, char** argv) { return CompositorTestSuite(argc, argv).Run(); diff --git a/ui/gfx/compositor/scoped_layer_animation_settings.cc b/ui/compositor/scoped_layer_animation_settings.cc index 9897949..038058b 100644 --- a/ui/gfx/compositor/scoped_layer_animation_settings.cc +++ b/ui/compositor/scoped_layer_animation_settings.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/scoped_layer_animation_settings.h" +#include "ui/compositor/scoped_layer_animation_settings.h" -#include "ui/gfx/compositor/layer_animation_observer.h" -#include "ui/gfx/compositor/layer_animator.h" +#include "ui/compositor/layer_animation_observer.h" +#include "ui/compositor/layer_animator.h" namespace { diff --git a/ui/gfx/compositor/scoped_layer_animation_settings.h b/ui/compositor/scoped_layer_animation_settings.h index 61c2b37..5ca4422 100644 --- a/ui/gfx/compositor/scoped_layer_animation_settings.h +++ b/ui/compositor/scoped_layer_animation_settings.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ -#define UI_GFX_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ +#ifndef UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ +#define UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ #pragma once #include <set> @@ -11,8 +11,8 @@ #include "base/time.h" #include "ui/base/animation/tween.h" -#include "ui/gfx/compositor/compositor_export.h" -#include "ui/gfx/compositor/layer_animator.h" +#include "ui/compositor/compositor_export.h" +#include "ui/compositor/layer_animator.h" namespace ui { @@ -51,4 +51,4 @@ class COMPOSITOR_EXPORT ScopedLayerAnimationSettings { } // namespace ui -#endif // UI_GFX_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ +#endif // UI_COMPOSITOR_SCOPED_LAYER_ANIMATION_SETTINGS_H_ diff --git a/ui/gfx/compositor/screen_rotation.cc b/ui/compositor/screen_rotation.cc index 5383af9..01d4cd2 100644 --- a/ui/gfx/compositor/screen_rotation.cc +++ b/ui/compositor/screen_rotation.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/screen_rotation.h" +#include "ui/compositor/screen_rotation.h" #include "base/debug/trace_event.h" #include "base/time.h" -#include "ui/gfx/compositor/layer_animation_delegate.h" +#include "ui/compositor/layer_animation_delegate.h" #include "ui/gfx/interpolated_transform.h" #include "ui/gfx/rect.h" #include "ui/gfx/transform.h" diff --git a/ui/gfx/compositor/screen_rotation.h b/ui/compositor/screen_rotation.h index 315b981..d436bd6 100644 --- a/ui/gfx/compositor/screen_rotation.h +++ b/ui/compositor/screen_rotation.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_SCREEN_ROTATION_H_ -#define UI_GFX_COMPOSITOR_SCREEN_ROTATION_H_ +#ifndef UI_COMPOSITOR_SCREEN_ROTATION_H_ +#define UI_COMPOSITOR_SCREEN_ROTATION_H_ #pragma once #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "ui/base/animation/animation_delegate.h" -#include "ui/gfx/compositor/compositor_export.h" -#include "ui/gfx/compositor/layer_animation_element.h" +#include "ui/compositor/compositor_export.h" +#include "ui/compositor/layer_animation_element.h" #include "ui/gfx/point.h" namespace ui { @@ -53,4 +53,4 @@ class COMPOSITOR_EXPORT ScreenRotation : public LayerAnimationElement { } // namespace ui -#endif // UI_GFX_COMPOSITOR_SCREEN_ROTATION_H_ +#endif // UI_COMPOSITOR_SCREEN_ROTATION_H_ diff --git a/ui/gfx/compositor/test/compositor_test_support.cc b/ui/compositor/test/compositor_test_support.cc index ba76f62..6134f54 100644 --- a/ui/gfx/compositor/test/compositor_test_support.cc +++ b/ui/compositor/test/compositor_test_support.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/test/compositor_test_support.h" +#include "ui/compositor/test/compositor_test_support.h" #include "base/compiler_specific.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" diff --git a/ui/gfx/compositor/test/compositor_test_support.h b/ui/compositor/test/compositor_test_support.h index bcad486..7db9f51 100644 --- a/ui/gfx/compositor/test/compositor_test_support.h +++ b/ui/compositor/test/compositor_test_support.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. diff --git a/ui/gfx/compositor/test/test_compositor_host.h b/ui/compositor/test/test_compositor_host.h index 5cee7e3..5cee7e3 100644 --- a/ui/gfx/compositor/test/test_compositor_host.h +++ b/ui/compositor/test/test_compositor_host.h diff --git a/ui/gfx/compositor/test/test_compositor_host_linux.cc b/ui/compositor/test/test_compositor_host_linux.cc index cf184f2..0359723 100644 --- a/ui/gfx/compositor/test/test_compositor_host_linux.cc +++ b/ui/compositor/test/test_compositor_host_linux.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/test/test_compositor_host.h" +#include "ui/compositor/test/test_compositor_host.h" #include "base/basictypes.h" #include "base/bind.h" @@ -11,7 +11,7 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "ui/base/x/x11_util.h" -#include "ui/gfx/compositor/compositor.h" +#include "ui/compositor/compositor.h" #include "ui/gfx/rect.h" #include <X11/Xlib.h> diff --git a/ui/gfx/compositor/test/test_compositor_host_mac.mm b/ui/compositor/test/test_compositor_host_mac.mm index 49d9da2..3d237aa 100644 --- a/ui/gfx/compositor/test/test_compositor_host_mac.mm +++ b/ui/compositor/test/test_compositor_host_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/test/test_compositor_host.h" +#include "ui/compositor/test/test_compositor_host.h" #import <AppKit/NSApplication.h> #import <AppKit/NSOpenGL.h> @@ -13,7 +13,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" -#include "ui/gfx/compositor/compositor.h" +#include "ui/compositor/compositor.h" #include "ui/gfx/rect.h" // AcceleratedTestView provides an NSView class that delegates drawing to a diff --git a/ui/gfx/compositor/test/test_compositor_host_win.cc b/ui/compositor/test/test_compositor_host_win.cc index 62a05dd..8e0c4f2 100644 --- a/ui/gfx/compositor/test/test_compositor_host_win.cc +++ b/ui/compositor/test/test_compositor_host_win.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/test/test_compositor_host.h" +#include "ui/compositor/test/test_compositor_host.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "ui/base/win/window_impl.h" -#include "ui/gfx/compositor/compositor.h" +#include "ui/compositor/compositor.h" namespace ui { diff --git a/ui/gfx/compositor/test/test_layer_animation_delegate.cc b/ui/compositor/test/test_layer_animation_delegate.cc index c079b45..b4cd481 100644 --- a/ui/gfx/compositor/test/test_layer_animation_delegate.cc +++ b/ui/compositor/test/test_layer_animation_delegate.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/test/test_layer_animation_delegate.h" +#include "ui/compositor/test/test_layer_animation_delegate.h" namespace ui { diff --git a/ui/gfx/compositor/test/test_layer_animation_delegate.h b/ui/compositor/test/test_layer_animation_delegate.h index 8625445..4b624b9 100644 --- a/ui/gfx/compositor/test/test_layer_animation_delegate.h +++ b/ui/compositor/test/test_layer_animation_delegate.h @@ -7,9 +7,9 @@ #pragma once #include "base/compiler_specific.h" +#include "ui/compositor/layer_animation_delegate.h" #include "ui/gfx/rect.h" #include "ui/gfx/transform.h" -#include "ui/gfx/compositor/layer_animation_delegate.h" namespace ui { diff --git a/ui/gfx/compositor/test/test_layer_animation_observer.cc b/ui/compositor/test/test_layer_animation_observer.cc index 2afcb1b..abc74ae 100644 --- a/ui/gfx/compositor/test/test_layer_animation_observer.cc +++ b/ui/compositor/test/test_layer_animation_observer.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/test/test_layer_animation_observer.h" +#include "ui/compositor/test/test_layer_animation_observer.h" #include <cstddef> diff --git a/ui/gfx/compositor/test/test_layer_animation_observer.h b/ui/compositor/test/test_layer_animation_observer.h index 44a7119..af0a9d8 100644 --- a/ui/gfx/compositor/test/test_layer_animation_observer.h +++ b/ui/compositor/test/test_layer_animation_observer.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "ui/gfx/compositor/layer_animation_observer.h" +#include "ui/compositor/layer_animation_observer.h" namespace ui { diff --git a/ui/gfx/compositor/test/test_suite.cc b/ui/compositor/test/test_suite.cc index 0b29f32..fd749bb 100644 --- a/ui/gfx/compositor/test/test_suite.cc +++ b/ui/compositor/test/test_suite.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/test/test_suite.h" +#include "ui/compositor/test/test_suite.h" #include "base/message_loop.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "ui/base/ui_base_paths.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/test/compositor_test_support.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/gfx/gfx_paths.h" #include "ui/gfx/gl/gl_implementation.h" diff --git a/ui/gfx/compositor/test/test_suite.h b/ui/compositor/test/test_suite.h index 140cd47..6f64fa6 100644 --- a/ui/gfx/compositor/test/test_suite.h +++ b/ui/compositor/test/test_suite.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. diff --git a/ui/gfx/compositor/test/test_utils.cc b/ui/compositor/test/test_utils.cc index 6700d85..43f7f02 100644 --- a/ui/gfx/compositor/test/test_utils.cc +++ b/ui/compositor/test/test_utils.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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 "ui/gfx/compositor/test/test_utils.h" +#include "ui/compositor/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/rect.h" diff --git a/ui/gfx/compositor/test/test_utils.h b/ui/compositor/test/test_utils.h index 61a8d41..47f91d9 100644 --- a/ui/gfx/compositor/test/test_utils.h +++ b/ui/compositor/test/test_utils.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. diff --git a/ui/gfx/compositor/test_web_graphics_context_3d.cc b/ui/compositor/test_web_graphics_context_3d.cc index 3bd4603..7d13815 100644 --- a/ui/gfx/compositor/test_web_graphics_context_3d.cc +++ b/ui/compositor/test_web_graphics_context_3d.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/gfx/compositor/test_web_graphics_context_3d.h" +#include "ui/compositor/test_web_graphics_context_3d.h" #include "ui/gfx/gl/gl_context_stub.h" #include "ui/gfx/gl/gl_surface_stub.h" diff --git a/ui/gfx/compositor/test_web_graphics_context_3d.h b/ui/compositor/test_web_graphics_context_3d.h index 7090e2f..a136ddc 100644 --- a/ui/gfx/compositor/test_web_graphics_context_3d.h +++ b/ui/compositor/test_web_graphics_context_3d.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_GFX_COMPOSITOR_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ -#define UI_GFX_COMPOSITOR_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ +#ifndef UI_COMPOSITOR_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ +#define UI_COMPOSITOR_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ #pragma once #include "base/logging.h" @@ -454,4 +454,4 @@ class TestWebGraphicsContext3D : public WebKit::WebGraphicsContext3D { } // namespace ui -#endif // UI_GFX_COMPOSITOR_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ +#endif // UI_COMPOSITOR_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ diff --git a/ui/oak/oak.gyp b/ui/oak/oak.gyp index a3090ac..b564b99 100644 --- a/ui/oak/oak.gyp +++ b/ui/oak/oak.gyp @@ -17,7 +17,7 @@ '../../build/temp_gyp/googleurl.gyp:googleurl', '../../skia/skia.gyp:skia', '../aura/aura.gyp:aura', - '../gfx/compositor/compositor.gyp:compositor', + '../compositor/compositor.gyp:compositor', '../ui.gyp:ui', '../ui.gyp:ui_resources', '../ui.gyp:ui_resources_standard', diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc index 0cc0d77..eabfd3f31 100644 --- a/ui/views/controls/textfield/native_textfield_views.cc +++ b/ui/views/controls/textfield/native_textfield_views.cc @@ -20,8 +20,8 @@ #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/range/range.h" +#include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" #include "ui/gfx/insets.h" #include "ui/gfx/render_text.h" #include "ui/views/background.h" diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc index 9cf79e2..5939879 100644 --- a/ui/views/run_all_unittests.cc +++ b/ui/views/run_all_unittests.cc @@ -5,8 +5,8 @@ #include "base/test/test_suite.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" -#include "ui/gfx/compositor/compositor_setup.h" -#include "ui/gfx/compositor/test/compositor_test_support.h" +#include "ui/compositor/compositor_setup.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/views/view.h" class ViewTestSuite : public base::TestSuite { diff --git a/ui/views/view.cc b/ui/views/view.cc index 186a69a..1b35ab7 100644 --- a/ui/views/view.cc +++ b/ui/views/view.cc @@ -15,10 +15,10 @@ #include "third_party/skia/include/core/SkRect.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/dragdrop/drag_drop_types.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animator.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animator.h" #include "ui/gfx/interpolated_transform.h" #include "ui/gfx/path.h" #include "ui/gfx/point3.h" diff --git a/ui/views/view.h b/ui/views/view.h index 0f250e3..e847abc 100644 --- a/ui/views/view.h +++ b/ui/views/view.h @@ -19,7 +19,7 @@ #include "build/build_config.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/gfx/compositor/layer_delegate.h" +#include "ui/compositor/layer_delegate.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/views/background.h" diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index fe167c3..71b606f 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -14,10 +14,10 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_animator.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_animator.h" #include "ui/gfx/path.h" #include "ui/gfx/transform.h" #include "ui/views/background.h" diff --git a/ui/views/views.gyp b/ui/views/views.gyp index e83e467..60e0a61 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -35,7 +35,7 @@ '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', '../base/strings/ui_strings.gyp:ui_strings', - '../gfx/compositor/compositor.gyp:compositor', + '../compositor/compositor.gyp:compositor', '../ui.gyp:ui', '../ui.gyp:ui_resources', '../ui.gyp:ui_resources_standard', @@ -493,8 +493,8 @@ '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', '../base/strings/ui_strings.gyp:ui_strings', - '../gfx/compositor/compositor.gyp:compositor', - '../gfx/compositor/compositor.gyp:compositor_test_support', + '../compositor/compositor.gyp:compositor', + '../compositor/compositor.gyp:compositor_test_support', '../ui.gyp:gfx_resources', '../ui.gyp:ui', '../ui.gyp:ui_resources', @@ -727,8 +727,8 @@ }], ['use_aura==1', { 'dependencies': [ - '../gfx/compositor/compositor.gyp:compositor', - '../gfx/compositor/compositor.gyp:compositor_test_support', + '../compositor/compositor.gyp:compositor', + '../compositor/compositor.gyp:compositor_test_support', ], }], ['OS=="win"', { diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index b4e6d68..86097cd 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -19,8 +19,8 @@ #include "ui/aura/window_observer.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/ui_base_types.h" +#include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" #include "ui/gfx/font.h" #include "ui/gfx/screen.h" #include "ui/views/drag_utils.h" diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc index bc20e0f..872dff6 100644 --- a/ui/views/widget/root_view.cc +++ b/ui/views/widget/root_view.cc @@ -11,8 +11,8 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" #include "ui/views/focus/view_storage.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/widget/widget.h" diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index 09a8380..c2f5ebf 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -10,8 +10,8 @@ #include "ui/base/hit_test.h" #include "ui/base/l10n/l10n_font_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/layer.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/layer.h" #include "ui/gfx/screen.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/focus/focus_manager_factory.h" diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h index b88005f..c754e95 100644 --- a/ui/views/widget/widget.h +++ b/ui/views/widget/widget.h @@ -14,7 +14,7 @@ #include "base/observer_list.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/ui_base_types.h" -#include "ui/gfx/compositor/layer_type.h" +#include "ui/compositor/layer_type.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" #include "ui/views/focus/focus_manager.h" |