Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

Unified Diff: content/common/cursors/webcursor_gtk.cc

Issue 201473002: Move webcursors code from webkit/ to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gfx image include Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/cursors/webcursor_aurax11.cc ('k') | content/common/cursors/webcursor_gtk_data.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/cursors/webcursor_gtk.cc
diff --git a/webkit/common/cursors/webcursor_gtk.cc b/content/common/cursors/webcursor_gtk.cc
similarity index 97%
rename from webkit/common/cursors/webcursor_gtk.cc
rename to content/common/cursors/webcursor_gtk.cc
index eeb3aa93ea537995503560adf1bfd2483a4cc885..a20db7b02ec8cfcb6112372ca3546d47de951ec0 100644
--- a/webkit/common/cursors/webcursor_gtk.cc
+++ b/content/common/cursors/webcursor_gtk.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 "webkit/common/cursors/webcursor.h"
+#include "content/common/cursors/webcursor.h"
#include <gdk/gdk.h>
#include <gtk/gtk.h>
@@ -16,7 +16,7 @@ using blink::WebCursorInfo;
namespace {
// webcursor_gtk_data.h is taken directly from WebKit's CursorGtk.h.
-#include "webkit/common/cursors/webcursor_gtk_data.h"
+#include "content/common/cursors/webcursor_gtk_data.h"
// This helper function is taken directly from WebKit's CursorGtk.cpp.
// It attempts to create a custom cursor from the data inlined in
@@ -44,7 +44,9 @@ GdkCursor* GetInlineCustomCursor(CustomCursorType type) {
return cursor;
}
-} // end anonymous namespace
+} // namespace
+
+namespace content {
int WebCursor::GetCursorType() const {
// http://library.gnome.org/devel/gdk/2.12/gdk-Cursors.html has images
@@ -220,3 +222,5 @@ void WebCursor::CopyPlatformData(const WebCursor& other) {
unref_ = gdk_cursor_ref(other.unref_);
return;
}
+
+} // namespace content
« no previous file with comments | « content/common/cursors/webcursor_aurax11.cc ('k') | content/common/cursors/webcursor_gtk_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698