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

Side by Side Diff: webkit/glue/webcursor_gtk.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/webcursor.h ('k') | webkit/glue/webcursor_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/glue/webcursor.h" 5 #include "webkit/glue/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 "gfx/gtk_util.h"
12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" 11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
12 #include "ui/gfx/gtk_util.h"
13 13
14 using WebKit::WebCursorInfo; 14 using WebKit::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/glue/webcursor_gtk_data.h" 19 #include "webkit/glue/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.
22 // It attempts to create a custom cursor from the data inlined in 22 // It attempts to create a custom cursor from the data inlined in
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 unref_ = NULL; 228 unref_ = NULL;
229 } 229 }
230 return; 230 return;
231 } 231 }
232 232
233 void WebCursor::CopyPlatformData(const WebCursor& other) { 233 void WebCursor::CopyPlatformData(const WebCursor& other) {
234 if (other.unref_) 234 if (other.unref_)
235 unref_ = gdk_cursor_ref(other.unref_); 235 unref_ = gdk_cursor_ref(other.unref_);
236 return; 236 return;
237 } 237 }
OLDNEW
« no previous file with comments | « webkit/glue/webcursor.h ('k') | webkit/glue/webcursor_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698