move webkit/glue/cursor_utils* to webkit/renderer/

R=jamesr@chromium.org
BUG=239107

Review URL: https://chromiumcodereview.appspot.com/17120003

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

5 files changed, 23 insertions, 20 deletions

diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 042d0c0..903c01e 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -23,7 +23,6 @@
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/v8_value_converter_impl.h"
 #include "skia/ext/platform_canvas.h"
-#include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMCustomEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
@@ -34,9 +33,10 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "third_party/WebKit/public/platform/WebRect.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "webkit/glue/cursor_utils.h"
 #include "webkit/plugins/sad_plugin.h"
+#include "webkit/renderer/cursor_utils.h"
 
 #if defined (OS_WIN)
 #include "base/sys_info.h"
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index b0d5a44..fd84bb6 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -34,11 +34,6 @@
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "ipc/ipc_sync_message.h"
 #include "skia/ext/platform_canvas.h"
-#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
-#include "third_party/WebKit/public/platform/WebPoint.h"
-#include "third_party/WebKit/public/platform/WebRect.h"
-#include "third_party/WebKit/public/platform/WebSize.h"
-#include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebHelperPlugin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPagePopup.h"
@@ -46,6 +41,11 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupMenuInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRange.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
+#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
+#include "third_party/WebKit/public/platform/WebPoint.h"
+#include "third_party/WebKit/public/platform/WebRect.h"
+#include "third_party/WebKit/public/platform/WebSize.h"
+#include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/point.h"
@@ -54,11 +54,11 @@
 #include "ui/gfx/skia_util.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/surface/transport_dib.h"
-#include "webkit/glue/cursor_utils.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/renderer/compositor_bindings/web_rendering_stats_impl.h"
+#include "webkit/renderer/cursor_utils.h"
 
 #if defined(OS_ANDROID)
 #include "content/renderer/android/synchronous_compositor_factory.h"
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index f551885..8ac783e 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -177,9 +177,12 @@
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
-        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+        '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
+        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+        '<(DEPTH)/ui/ui.gyp:ui',
         'glue_common',
+        'webkit_common',
       ],
 
       'sources': [
@@ -187,6 +190,8 @@
         '../renderer/cpp_bound_class.h',
         '../renderer/cpp_variant.cc',
         '../renderer/cpp_variant.h',
+        '../renderer/cursor_utils.cc',
+        '../renderer/cursor_utils.h',
         '../renderer/webkit_renderer_export.h',
         '../renderer/webpreferences_renderer.cc',
         '../renderer/webpreferences_renderer.h',
@@ -239,8 +244,6 @@
         '<(SHARED_INTERMEDIATE_DIR)/ui',
       ],
       'sources': [
-        'cursor_utils.cc',
-        'cursor_utils.h',
         'ftp_directory_listing_response_delegate.cc',
         'ftp_directory_listing_response_delegate.h',
         'glue_serialize_deprecated.cc',
diff --git a/webkit/glue/cursor_utils.cc b/webkit/renderer/cursor_utils.cc
index 79e7169..87f305b 100644
--- a/webkit/glue/cursor_utils.cc
+++ b/webkit/renderer/cursor_utils.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "webkit/glue/cursor_utils.h"
+#include "webkit/renderer/cursor_utils.h"
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 
diff --git a/webkit/glue/cursor_utils.h b/webkit/renderer/cursor_utils.h
index b569345..3e261cb 100644
--- a/webkit/glue/cursor_utils.h
+++ b/webkit/renderer/cursor_utils.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef WEBKIT_GLUE_CURSOR_UTILS_H_
-#define WEBKIT_GLUE_CURSOR_UTILS_H_
+#ifndef WEBKIT_RENDERER_CURSOR_UTILS_H_
+#define WEBKIT_RENDERER_CURSOR_UTILS_H_
 
 #include "webkit/common/cursors/webcursor.h"
-#include "webkit/glue/webkit_glue_export.h"
+#include "webkit/renderer/webkit_renderer_export.h"
 
 namespace WebKit {
 struct WebCursorInfo;
@@ -15,15 +15,15 @@ struct WebCursorInfo;
 namespace webkit_glue {
 
 // Adapts our cursor info to WebKit::WebCursorInfo.
-WEBKIT_GLUE_EXPORT bool GetWebKitCursorInfo(
+WEBKIT_RENDERER_EXPORT bool GetWebKitCursorInfo(
     const WebCursor& cursor,
     WebKit::WebCursorInfo* webkit_cursor_info);
 
 // Adapts WebKit::CursorInfo to our cursor.
-WEBKIT_GLUE_EXPORT void InitializeCursorFromWebKitCursorInfo(
+WEBKIT_RENDERER_EXPORT void InitializeCursorFromWebKitCursorInfo(
     WebCursor* cursor,
     const WebKit::WebCursorInfo& webkit_cursor_info);
 
 }  // namespace webkit_glue
 
-#endif  // WEBKIT_GLUE_CURSOR_UTILS_H_
+#endif  // WEBKIT_RENDERER_CURSOR_UTILS_H_