Move ui/base/latency_info* to ui/events

Latest in a sequence of changes to extract ui/gfx as its own component and sever ties on ui/base from various should-be-lower-level components. TBR=jamesr@chromium.org, sky@chromium.org BUG=none Review URL: https://codereview.chromium.org/23464099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224496 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Sep 20, 2013 · 1c603da · 1c603da
1 parent 5c1c652
commit 1c603da
Show file tree

Hide file tree

Showing 40 changed files with 142 additions and 105 deletions.
diff --git a/cc/DEPS b/cc/DEPS
@@ -6,7 +6,7 @@ include_rules = [
   "+third_party/skia/include",
   "+third_party/khronos/GLES2/gl2.h",
   "+third_party/khronos/GLES2/gl2ext.h",
-  "+ui/base",
+  "+ui/events/latency_info.h",
   "+ui/gfx",
   "+ui/gl",
   # DO NOT ADD ANY NEW WEBKIT HEADERS TO THIS LIST.

diff --git a/cc/output/compositor_frame_metadata.h b/cc/output/compositor_frame_metadata.h
@@ -6,7 +6,7 @@
 #define CC_OUTPUT_COMPOSITOR_FRAME_METADATA_H_
 
 #include "cc/base/cc_export.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 #include "ui/gfx/size_f.h"
 #include "ui/gfx/vector2d_f.h"
 

diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
@@ -35,7 +35,7 @@
 #include "cc/trees/occlusion_tracker.h"
 #include "cc/trees/proxy.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 #include "ui/gfx/rect.h"
 
 namespace WebKit { class WebGraphicsContext3D; }

diff --git a/cc/trees/layer_tree_impl.h b/cc/trees/layer_tree_impl.h
@@ -13,7 +13,7 @@
 #include "base/values.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/resources/ui_resource_client.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {

diff --git a/content/browser/android/in_process/synchronous_input_event_filter.cc b/content/browser/android/in_process/synchronous_input_event_filter.cc
@@ -8,7 +8,7 @@
 #include "cc/input/input_handler.h"
 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
 #include "content/public/browser/browser_thread.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 
 using WebKit::WebInputEvent;
 

diff --git a/content/browser/aura/software_browser_compositor_output_surface.cc b/content/browser/aura/software_browser_compositor_output_surface.cc
@@ -8,7 +8,7 @@
 #include "cc/output/compositor_frame.h"
 #include "cc/output/software_output_device.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 
 namespace content {
 

diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
@@ -36,7 +36,7 @@
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_switches.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 #include "ui/gl/gl_switches.h"
 
 

diff --git a/content/browser/renderer_host/compositing_iosurface_mac.h b/content/browser/renderer_host/compositing_iosurface_mac.h
@@ -19,7 +19,7 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "media/base/video_frame.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"

diff --git a/content/browser/renderer_host/input/input_queue_unittest.cc b/content/browser/renderer_host/input/input_queue_unittest.cc
@@ -14,7 +14,7 @@
 #include "content/common/input/web_input_event_payload.h"
 #include "content/common/input_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 
 namespace content {
 namespace {

diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
@@ -35,7 +35,7 @@
 #include "ipc/ipc_listener.h"
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 #include "ui/gfx/native_widget_types.h"
 
 class WebCursor;

diff --git a/content/common/content_param_traits_macros.h b/content/common/content_param_traits_macros.h
@@ -11,7 +11,7 @@
 #include "content/common/content_export.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 #include "webkit/common/resource_type.h"
 
 #undef IPC_MESSAGE_EXPORT

diff --git a/content/common/gpu/client/command_buffer_proxy_impl.h b/content/common/gpu/client/command_buffer_proxy_impl.h
@@ -24,7 +24,7 @@
 #include "gpu/command_buffer/common/command_buffer_shared.h"
 #include "ipc/ipc_listener.h"
 #include "media/video/video_decode_accelerator.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 
 struct GPUCommandBufferConsoleMessage;
 

diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
@@ -23,7 +23,7 @@
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
 #include "media/base/video_decoder_config.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gl/gl_surface.h"

diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
@@ -27,7 +27,7 @@
 #include "media/base/video_frame.h"
 #include "media/video/video_decode_accelerator.h"
 #include "media/video/video_encode_accelerator.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gl/gpu_preference.h"

diff --git a/content/common/gpu/image_transport_surface.h b/content/common/gpu/image_transport_surface.h
@@ -15,7 +15,7 @@
 #include "content/common/content_export.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"

diff --git a/content/common/input/web_input_event_payload.h b/content/common/input/web_input_event_payload.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
 #include "content/common/input/input_event.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 
 namespace WebKit {
 class WebInputEvent;

diff --git a/content/common/input_messages.h b/content/common/input_messages.h
@@ -19,7 +19,7 @@
 #include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 

diff --git a/content/port/browser/event_with_latency_info.h b/content/port/browser/event_with_latency_info.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_PORT_BROWSER_EVENT_WITH_LATENCY_INFO_H_
 #define CONTENT_PORT_BROWSER_EVENT_WITH_LATENCY_INFO_H_
 
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 
 namespace WebKit {
 class WebGestureEvent;

diff --git a/content/renderer/gpu/input_handler_proxy.cc b/content/renderer/gpu/input_handler_proxy.cc
@@ -10,7 +10,7 @@
 #include "content/renderer/gpu/input_handler_proxy_client.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 
 using WebKit::WebFloatPoint;
 using WebKit::WebFloatSize;

diff --git a/content/renderer/gpu/input_handler_proxy_unittest.cc b/content/renderer/gpu/input_handler_proxy_unittest.cc
@@ -14,7 +14,7 @@
 #include "third_party/WebKit/public/platform/WebGestureCurve.h"
 #include "third_party/WebKit/public/platform/WebPoint.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/base/latency_info.h"
+#include "ui/events/latency_info.h"
 
 using WebKit::WebActiveWheelFlingParameters;
 using WebKit::WebFloatPoint;

diff --git a/ui/events/event.h b/ui/events/event.h
@@ -12,10 +12,9 @@
 #include "base/time/time.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/gestures/gesture_types.h"
-#include "ui/base/latency_info.h"
-#include "ui/base/ui_export.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
+#include "ui/events/latency_info.h"
 #include "ui/gfx/point.h"
 
 namespace gfx {
@@ -25,7 +24,7 @@ class Transform;
 namespace ui {
 class EventTarget;
 
-class UI_EXPORT Event {
+class EVENTS_EXPORT Event {
  public:
   virtual ~Event();
 
@@ -238,13 +237,13 @@ class UI_EXPORT Event {
   EventResult result_;
 };
 
-class UI_EXPORT CancelModeEvent : public Event {
+class EVENTS_EXPORT CancelModeEvent : public Event {
  public:
   CancelModeEvent();
   virtual ~CancelModeEvent();
 };
 
-class UI_EXPORT LocatedEvent : public Event {
+class EVENTS_EXPORT LocatedEvent : public Event {
  public:
   // For testing.
   class TestApi : public Event::TestApi {
@@ -311,7 +310,7 @@ class UI_EXPORT LocatedEvent : public Event {
   gfx::Point root_location_;
 };
 
-class UI_EXPORT MouseEvent : public LocatedEvent {
+class EVENTS_EXPORT MouseEvent : public LocatedEvent {
  public:
   explicit MouseEvent(const base::NativeEvent& native_event);
 
@@ -408,7 +407,7 @@ class UI_EXPORT MouseEvent : public LocatedEvent {
 
 class ScrollEvent;
 
-class UI_EXPORT MouseWheelEvent : public MouseEvent {
+class EVENTS_EXPORT MouseWheelEvent : public MouseEvent {
  public:
   // See |offset| for details.
   static const int kWheelDelta;
@@ -442,7 +441,7 @@ class UI_EXPORT MouseWheelEvent : public MouseEvent {
   gfx::Vector2d offset_;
 };
 
-class UI_EXPORT TouchEvent : public LocatedEvent {
+class EVENTS_EXPORT TouchEvent : public LocatedEvent {
  public:
   explicit TouchEvent(const base::NativeEvent& native_event);
 
@@ -525,7 +524,7 @@ class UI_EXPORT TouchEvent : public LocatedEvent {
   float force_;
 };
 
-class UI_EXPORT KeyEvent : public Event {
+class EVENTS_EXPORT KeyEvent : public Event {
  public:
   KeyEvent(const base::NativeEvent& native_event, bool is_char);
 
@@ -585,7 +584,7 @@ class UI_EXPORT KeyEvent : public Event {
 // TranslatedKeyEvent(VKEY_SPACE) event. If the IME receives a KeyEvent and
 // it does consume the event, it might dispatch a
 // TranslatedKeyEvent(VKEY_PROCESSKEY) event as defined in the DOM spec.
-class UI_EXPORT TranslatedKeyEvent : public KeyEvent {
+class EVENTS_EXPORT TranslatedKeyEvent : public KeyEvent {
  public:
   TranslatedKeyEvent(const base::NativeEvent& native_event, bool is_char);
 
@@ -600,7 +599,7 @@ class UI_EXPORT TranslatedKeyEvent : public KeyEvent {
   DISALLOW_COPY_AND_ASSIGN(TranslatedKeyEvent);
 };
 
-class UI_EXPORT DropTargetEvent : public LocatedEvent {
+class EVENTS_EXPORT DropTargetEvent : public LocatedEvent {
  public:
   DropTargetEvent(const OSExchangeData& data,
                   const gfx::Point& location,
@@ -620,7 +619,7 @@ class UI_EXPORT DropTargetEvent : public LocatedEvent {
   DISALLOW_COPY_AND_ASSIGN(DropTargetEvent);
 };
 
-class UI_EXPORT ScrollEvent : public MouseEvent {
+class EVENTS_EXPORT ScrollEvent : public MouseEvent {
  public:
   explicit ScrollEvent(const base::NativeEvent& native_event);
   template <class T>
@@ -672,7 +671,7 @@ class UI_EXPORT ScrollEvent : public MouseEvent {
   int finger_count_;
 };
 
-class UI_EXPORT GestureEvent : public LocatedEvent {
+class EVENTS_EXPORT GestureEvent : public LocatedEvent {
  public:
   GestureEvent(EventType type,
                int x,

diff --git a/ui/events/event_conversion_gtk.h b/ui/events/event_conversion_gtk.h
@@ -7,13 +7,13 @@
 
 #include <gtk/gtk.h>
 
-#include "ui/base/ui_export.h"
+#include "ui/events/events_export.h"
 
 namespace ui {
 
-UI_EXPORT int GdkModifierToEventFlag(GdkModifierType gdk_modifier);
+EVENTS_EXPORT int GdkModifierToEventFlag(GdkModifierType gdk_modifier);
 
-UI_EXPORT GdkModifierType EventFlagToGdkModifier(int event_flag);
+EVENTS_EXPORT GdkModifierType EventFlagToGdkModifier(int event_flag);
 
 }  // namespace ui
 

diff --git a/ui/events/event_dispatcher.h b/ui/events/event_dispatcher.h
@@ -6,16 +6,16 @@
 #define UI_EVENTS_EVENT_DISPATCHER_H_
 
 #include "base/auto_reset.h"
-#include "ui/base/ui_export.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_target.h"
+#include "ui/events/events_export.h"
 
 namespace ui {
 
 class EventDispatcher;
 
-class UI_EXPORT EventDispatcherDelegate {
+class EVENTS_EXPORT EventDispatcherDelegate {
  public:
   EventDispatcherDelegate();
   virtual ~EventDispatcherDelegate();
@@ -42,7 +42,7 @@ class UI_EXPORT EventDispatcherDelegate {
 };
 
 // Dispatches events to appropriate targets.
-class UI_EXPORT EventDispatcher {
+class EVENTS_EXPORT EventDispatcher {
  public:
   explicit EventDispatcher(EventDispatcherDelegate* delegate);
   virtual ~EventDispatcher();

diff --git a/ui/events/event_handler.h b/ui/events/event_handler.h
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ui/base/ui_export.h"
 #include "ui/events/event_constants.h"
+#include "ui/events/events_export.h"
 
 namespace ui {
 
@@ -26,7 +26,7 @@ class TouchEvent;
 
 // Dispatches events to appropriate targets.  The default implementations of
 // all of the specific handlers (e.g. OnKeyEvent, OnMouseEvent) do nothing.
-class UI_EXPORT EventHandler {
+class EVENTS_EXPORT EventHandler {
  public:
   EventHandler();
   virtual ~EventHandler();

diff --git a/ui/events/event_target.h b/ui/events/event_target.h
@@ -7,14 +7,14 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "ui/base/ui_export.h"
 #include "ui/events/event_handler.h"
+#include "ui/events/events_export.h"
 
 namespace ui {
 
 class EventDispatcher;
 
-class UI_EXPORT EventTarget : public EventHandler {
+class EVENTS_EXPORT EventTarget : public EventHandler {
  public:
   typedef std::vector<EventTarget*> EventTargets;