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

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

Issue 8787003: Update these includes to use the new header locations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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/webclipboard_impl.cc ('k') | webkit/glue/webcursor_mac.mm » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/logging.h" 7 #include "base/logging.h"
8 #include "base/pickle.h" 8 #include "base/pickle.h"
9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebImage.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h"
11 11
12 using WebKit::WebCursorInfo; 12 using WebKit::WebCursorInfo;
13 using WebKit::WebImage; 13 using WebKit::WebImage;
14 14
15 static const int kMaxCursorDimension = 1024; 15 static const int kMaxCursorDimension = 1024;
16 16
17 WebCursor::WebCursor() 17 WebCursor::WebCursor()
18 : type_(WebCursorInfo::TypePointer) { 18 : type_(WebCursorInfo::TypePointer) {
19 InitPlatformData(); 19 InitPlatformData();
20 } 20 }
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 void WebCursor::ClampHotspot() { 200 void WebCursor::ClampHotspot() {
201 if (!IsCustom()) 201 if (!IsCustom())
202 return; 202 return;
203 203
204 // Clamp the hotspot to the custom image's dimensions. 204 // Clamp the hotspot to the custom image's dimensions.
205 hotspot_.set_x(std::max(0, 205 hotspot_.set_x(std::max(0,
206 std::min(custom_size_.width() - 1, hotspot_.x()))); 206 std::min(custom_size_.width() - 1, hotspot_.x())));
207 hotspot_.set_y(std::max(0, 207 hotspot_.set_y(std::max(0,
208 std::min(custom_size_.height() - 1, hotspot_.y()))); 208 std::min(custom_size_.height() - 1, hotspot_.y())));
209 } 209 }
OLDNEW
« no previous file with comments | « webkit/glue/webclipboard_impl.cc ('k') | webkit/glue/webcursor_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698