diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 00:58:40 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 00:58:40 +0000 |
commit | 953bd00695caa3ae8a569f1500f9d7329bdb2fab (patch) | |
tree | 8504c84eeb2eb5d8b852968f51a099c44e1a2d1d /webkit/renderer | |
parent | 566c5b4c733240f6dd4fbea3602ef777fafc213b (diff) | |
download | chromium_src-953bd00695caa3ae8a569f1500f9d7329bdb2fab.zip chromium_src-953bd00695caa3ae8a569f1500f9d7329bdb2fab.tar.gz chromium_src-953bd00695caa3ae8a569f1500f9d7329bdb2fab.tar.bz2 |
Move cursor_utils.* from webkit/renderer to content/renderer.
BUG=265753
R=jam@chromium.org, jamesr@chromium.org
Review URL: https://codereview.chromium.org/21286006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/renderer')
-rw-r--r-- | webkit/renderer/cursor_utils.cc | 43 | ||||
-rw-r--r-- | webkit/renderer/cursor_utils.h | 29 | ||||
-rw-r--r-- | webkit/renderer/webkit_renderer.gyp | 2 |
3 files changed, 0 insertions, 74 deletions
diff --git a/webkit/renderer/cursor_utils.cc b/webkit/renderer/cursor_utils.cc deleted file mode 100644 index 0897f28..0000000 --- a/webkit/renderer/cursor_utils.cc +++ /dev/null @@ -1,43 +0,0 @@ -// 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/renderer/cursor_utils.h" - -#include "third_party/WebKit/public/web/WebCursorInfo.h" - -using WebKit::WebCursorInfo; - -namespace webkit_glue { - -bool GetWebKitCursorInfo(const WebCursor& cursor, - WebCursorInfo* webkit_cursor_info) { - WebCursor::CursorInfo cursor_info; - cursor.GetCursorInfo(&cursor_info); - - webkit_cursor_info->type = cursor_info.type; - webkit_cursor_info->hotSpot = cursor_info.hotspot; - webkit_cursor_info->customImage = cursor_info.custom_image; - webkit_cursor_info->imageScaleFactor = cursor_info.image_scale_factor; -#if defined(OS_WIN) - webkit_cursor_info->externalHandle = cursor_info.external_handle; -#endif - return true; -} - -void InitializeCursorFromWebKitCursorInfo( - WebCursor* cursor, - const WebCursorInfo& webkit_cursor_info) { - WebCursor::CursorInfo web_cursor_info; - web_cursor_info.type = webkit_cursor_info.type; - web_cursor_info.image_scale_factor = webkit_cursor_info.imageScaleFactor; - web_cursor_info.hotspot = webkit_cursor_info.hotSpot; - web_cursor_info.custom_image = webkit_cursor_info.customImage.getSkBitmap(); -#if defined(OS_WIN) - web_cursor_info.external_handle = webkit_cursor_info.externalHandle; -#endif - cursor->InitFromCursorInfo(web_cursor_info); -} - -} // namespce webkit_glue - diff --git a/webkit/renderer/cursor_utils.h b/webkit/renderer/cursor_utils.h deleted file mode 100644 index 3e261cb..0000000 --- a/webkit/renderer/cursor_utils.h +++ /dev/null @@ -1,29 +0,0 @@ -// 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_RENDERER_CURSOR_UTILS_H_ -#define WEBKIT_RENDERER_CURSOR_UTILS_H_ - -#include "webkit/common/cursors/webcursor.h" -#include "webkit/renderer/webkit_renderer_export.h" - -namespace WebKit { -struct WebCursorInfo; -}; - -namespace webkit_glue { - -// Adapts our cursor info to WebKit::WebCursorInfo. -WEBKIT_RENDERER_EXPORT bool GetWebKitCursorInfo( - const WebCursor& cursor, - WebKit::WebCursorInfo* webkit_cursor_info); - -// Adapts WebKit::CursorInfo to our cursor. -WEBKIT_RENDERER_EXPORT void InitializeCursorFromWebKitCursorInfo( - WebCursor* cursor, - const WebKit::WebCursorInfo& webkit_cursor_info); - -} // namespace webkit_glue - -#endif // WEBKIT_RENDERER_CURSOR_UTILS_H_ diff --git a/webkit/renderer/webkit_renderer.gyp b/webkit/renderer/webkit_renderer.gyp index dd7209a..f698d8c 100644 --- a/webkit/renderer/webkit_renderer.gyp +++ b/webkit/renderer/webkit_renderer.gyp @@ -29,8 +29,6 @@ 'cpp_variant.h', 'clipboard_utils.cc', 'clipboard_utils.h', - 'cursor_utils.cc', - 'cursor_utils.h', 'webkit_renderer_export.h', 'webpreferences_renderer.cc', 'webpreferences_renderer.h', |