OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/common/cursors/webcursor.h" | 5 #include "webkit/common/cursors/webcursor.h" |
6 | 6 |
7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "third_party/WebKit/public/web/WebCursorInfo.h" | 11 #include "third_party/WebKit/public/platform/WebCursorInfo.h" |
12 #include "ui/gfx/gtk_util.h" | 12 #include "ui/gfx/gtk_util.h" |
13 | 13 |
14 using blink::WebCursorInfo; | 14 using blink::WebCursorInfo; |
15 | 15 |
16 namespace { | 16 namespace { |
17 | 17 |
18 // webcursor_gtk_data.h is taken directly from WebKit's CursorGtk.h. | 18 // webcursor_gtk_data.h is taken directly from WebKit's CursorGtk.h. |
19 #include "webkit/common/cursors/webcursor_gtk_data.h" | 19 #include "webkit/common/cursors/webcursor_gtk_data.h" |
20 | 20 |
21 // This helper function is taken directly from WebKit's CursorGtk.cpp. | 21 // This helper function is taken directly from WebKit's CursorGtk.cpp. |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 unref_ = NULL; | 213 unref_ = NULL; |
214 } | 214 } |
215 return; | 215 return; |
216 } | 216 } |
217 | 217 |
218 void WebCursor::CopyPlatformData(const WebCursor& other) { | 218 void WebCursor::CopyPlatformData(const WebCursor& other) { |
219 if (other.unref_) | 219 if (other.unref_) |
220 unref_ = gdk_cursor_ref(other.unref_); | 220 unref_ = gdk_cursor_ref(other.unref_); |
221 return; | 221 return; |
222 } | 222 } |
OLD | NEW |