Revert of Cleanup: Update the path to vector2d_f.h header. (patchset …

…#1 id:1 of https://codereview.chromium.org/781863004/) Reason for revert: Breaks Win8 GN and Win8 GN(dbg) builders Original issue's description: > Cleanup: Update the path to vector2d_f.h header. > > The geometry headers were moved from /ui/gfx/ to ui/gfx/geometry, so > we are updating the include paths to fix this. > > BUG=395370 > TEST=gfx_unittests > TBR=sky@chromium.org,danakj@chromium.org > > Committed: https://crrev.com/b486216287a3e1f30e81f70444f889d321b7819a > Cr-Commit-Position: refs/heads/master@{#306960} TBR=danakj@chromium.org,sky@chromium.org,tfarina@chromium.org NOTREECHECKS=true NOTRY=true BUG=395370 Review URL: https://codereview.chromium.org/771283003 Cr-Commit-Position: refs/heads/master@{#306962}
dednal · Dec 5, 2014 · 0dffffd · 0dffffd
1 parent def3769
commit 0dffffd
Show file tree

Hide file tree

Showing 19 changed files with 42 additions and 36 deletions.
diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h
@@ -12,8 +12,8 @@
 #include "base/debug/trace_event.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/android/synchronous_compositor_client.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/geometry/vector2d_f.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/vector2d_f.h"
 
 class SkCanvas;
 class SkPicture;

diff --git a/content/browser/android/in_process/synchronous_input_event_filter.h b/content/browser/android/in_process/synchronous_input_event_filter.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/renderer/input/input_handler_manager_client.h"
-#include "ui/gfx/geometry/vector2d_f.h"
+#include "ui/gfx/vector2d_f.h"
 
 namespace blink {
 class WebInputEvent;

diff --git a/content/browser/android/overscroll_glow.h b/content/browser/android/overscroll_glow.h
@@ -8,8 +8,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "ui/gfx/geometry/size_f.h"
-#include "ui/gfx/geometry/vector2d_f.h"
+#include "ui/gfx/size_f.h"
+#include "ui/gfx/vector2d_f.h"
 
 namespace cc {
 class Layer;

diff --git a/content/browser/android/overscroll_refresh.h b/content/browser/android/overscroll_refresh.h
@@ -8,8 +8,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
-#include "ui/gfx/geometry/size_f.h"
-#include "ui/gfx/geometry/vector2d_f.h"
+#include "ui/gfx/size_f.h"
+#include "ui/gfx/vector2d_f.h"
 
 namespace cc {
 class Layer;

diff --git a/content/browser/frame_host/render_widget_host_view_guest.h b/content/browser/frame_host/render_widget_host_view_guest.h
@@ -14,9 +14,9 @@
 #include "ui/events/event.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 #include "ui/events/gestures/gesture_types.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/geometry/vector2d_f.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/vector2d_f.h"
 
 namespace content {
 class BrowserPluginGuest;

diff --git a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc
@@ -20,10 +20,10 @@
 #include "content/test/test_render_view_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/gfx/geometry/point.h"
-#include "ui/gfx/geometry/point_f.h"
-#include "ui/gfx/geometry/vector2d.h"
-#include "ui/gfx/geometry/vector2d_f.h"
+#include "ui/gfx/point.h"
+#include "ui/gfx/point_f.h"
+#include "ui/gfx/vector2d.h"
+#include "ui/gfx/vector2d_f.h"
 
 using blink::WebInputEvent;
 using blink::WebMouseEvent;

diff --git a/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h b/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h
@@ -12,8 +12,8 @@
 #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
 #include "content/common/input/synthetic_web_input_event_builders.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/gfx/geometry/vector2d.h"
-#include "ui/gfx/geometry/vector2d_f.h"
+#include "ui/gfx/vector2d.h"
+#include "ui/gfx/vector2d_f.h"
 
 namespace content {
 

diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -29,8 +29,8 @@
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "ui/base/android/window_android_observer.h"
 #include "ui/events/gesture_detection/filtered_gesture_provider.h"
-#include "ui/gfx/geometry/size.h"
-#include "ui/gfx/geometry/vector2d_f.h"
+#include "ui/gfx/size.h"
+#include "ui/gfx/vector2d_f.h"
 
 struct ViewHostMsg_TextInputState_Params;
 

diff --git a/content/common/input_messages.h b/content/common/input_messages.h
@@ -24,11 +24,11 @@
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/ipc/latency_info_param_traits.h"
-#include "ui/gfx/geometry/point.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/geometry/vector2d_f.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
+#include "ui/gfx/point.h"
 #include "ui/gfx/range/range.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/vector2d_f.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT

diff --git a/content/common/view_messages.h b/content/common/view_messages.h
@@ -49,13 +49,13 @@
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/ui_base_types.h"
-#include "ui/gfx/geometry/point.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/geometry/rect_f.h"
-#include "ui/gfx/geometry/vector2d.h"
-#include "ui/gfx/geometry/vector2d_f.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
+#include "ui/gfx/point.h"
 #include "ui/gfx/range/range.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/rect_f.h"
+#include "ui/gfx/vector2d.h"
+#include "ui/gfx/vector2d_f.h"
 
 #if defined(OS_MACOSX)
 #include "content/common/mac/font_descriptor.h"

diff --git a/content/public/browser/android/synchronous_compositor_client.h b/content/public/browser/android/synchronous_compositor_client.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "ui/gfx/geometry/size_f.h"
-#include "ui/gfx/geometry/vector2d_f.h"
+#include "ui/gfx/vector2d_f.h"
 
 namespace content {
 

diff --git a/content/renderer/input/input_event_filter.cc b/content/renderer/input/input_event_filter.cc
@@ -18,7 +18,7 @@
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_sender.h"
-#include "ui/gfx/geometry/vector2d_f.h"
+#include "ui/gfx/vector2d_f.h"
 
 using blink::WebInputEvent;
 

diff --git a/content/renderer/input/input_handler_manager_client.h b/content/renderer/input/input_handler_manager_client.h
@@ -9,7 +9,7 @@
 #include "base/callback.h"
 #include "base/callback_forward.h"
 #include "content/common/content_export.h"
-#include "ui/gfx/geometry/vector2d_f.h"
+#include "ui/gfx/vector2d_f.h"
 
 namespace ui {
 struct LatencyInfo;

diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
@@ -36,11 +36,11 @@
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/base/ui_base_types.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/geometry/vector2d.h"
-#include "ui/gfx/geometry/vector2d_f.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/range/range.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/vector2d.h"
+#include "ui/gfx/vector2d_f.h"
 #include "ui/surface/transport_dib.h"
 
 struct ViewHostMsg_UpdateRect_Params;

diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h
@@ -17,7 +17,7 @@
 #include "ui/base/ime/dummy_text_input_client.h"
 #include "ui/base/layout.h"
 #include "ui/base/page_transition_types.h"
-#include "ui/gfx/geometry/vector2d_f.h"
+#include "ui/gfx/vector2d_f.h"
 
 // This file provides a testing framework for mocking out the RenderProcessHost
 // layer. It allows you to test RenderViewHost, WebContentsImpl,

diff --git a/ui/base/android/window_android.h b/ui/base/android/window_android.h
@@ -7,13 +7,12 @@
 
 #include <jni.h>
 #include <vector>
-
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "ui/base/ui_base_export.h"
-#include "ui/gfx/geometry/vector2d_f.h"
+#include "ui/gfx/vector2d_f.h"
 
 namespace ui {
 

diff --git a/ui/gfx/transform.h b/ui/gfx/transform.h
@@ -10,8 +10,8 @@
 
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
-#include "ui/gfx/geometry/vector2d_f.h"
 #include "ui/gfx/gfx_export.h"
+#include "ui/gfx/vector2d_f.h"
 
 namespace gfx {
 

diff --git a/ui/gfx/vector2d_f.h b/ui/gfx/vector2d_f.h
@@ -0,0 +1,7 @@
+// Copyright 2013 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.
+
+// TODO(beng): remove once callsites are patched.
+#include "ui/gfx/geometry/vector2d_f.h"
+
diff --git a/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h b/ui/views/widget/desktop_aura/x11_whole_screen_move_loop.h
@@ -10,9 +10,9 @@
 #include "base/memory/weak_ptr.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
-#include "ui/gfx/geometry/vector2d_f.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/vector2d_f.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/widget/desktop_aura/x11_move_loop.h"
 #include "ui/views/widget/desktop_aura/x11_move_loop_delegate.h"