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

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

Issue 387020: Upstreaming WebKit.gyp (Closed)
Patch Set: Created 11 years, 1 month 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
« no previous file with comments | « webkit/glue/webcursor_mac.mm ('k') | webkit/glue/webdevtoolsagent_impl.h » ('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) 2009 The Chromium Authors. All rights reserved. Use of this 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
2 // source code is governed by a BSD-style license that can be found in the 2 // source code is governed by a BSD-style license that can be found in the
3 // LICENSE file. 3 // LICENSE file.
4 4
5 #include "app/gfx/gdi_util.h" 5 #include "app/gfx/gdi_util.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/pickle.h" 7 #include "base/pickle.h"
8 #include "grit/webkit_resources.h" 8 #include "grit/webkit_resources.h"
9 #include "third_party/skia/include/core/SkBitmap.h" 9 #include "third_party/skia/include/core/SkBitmap.h"
10 #include "webkit/api/public/WebCursorInfo.h" 10 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
11 #include "webkit/glue/webcursor.h" 11 #include "webkit/glue/webcursor.h"
12 12
13 using WebKit::WebCursorInfo; 13 using WebKit::WebCursorInfo;
14 14
15 static LPCWSTR ToCursorID(WebCursorInfo::Type type) { 15 static LPCWSTR ToCursorID(WebCursorInfo::Type type) {
16 switch (type) { 16 switch (type) {
17 case WebCursorInfo::TypePointer: 17 case WebCursorInfo::TypePointer:
18 return IDC_ARROW; 18 return IDC_ARROW;
19 case WebCursorInfo::TypeCross: 19 case WebCursorInfo::TypeCross:
20 return IDC_CROSS; 20 return IDC_CROSS;
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 } 227 }
228 228
229 void WebCursor::CleanupPlatformData() { 229 void WebCursor::CleanupPlatformData() {
230 external_cursor_ = NULL; 230 external_cursor_ = NULL;
231 231
232 if (custom_cursor_) { 232 if (custom_cursor_) {
233 DestroyIcon(custom_cursor_); 233 DestroyIcon(custom_cursor_);
234 custom_cursor_ = NULL; 234 custom_cursor_ = NULL;
235 } 235 }
236 } 236 }
OLDNEW
« no previous file with comments | « webkit/glue/webcursor_mac.mm ('k') | webkit/glue/webdevtoolsagent_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698