Merge 55669 - Clamp the hotspot on custom cursors to the custom cursor image'...

webkit/glue/webcursor.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webcursor.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebImage.h"
@@ skipping 39 matching lines @@
   if (cursor_info.externalHandle) {
     InitFromExternalCursor(cursor_info.externalHandle);
     return;
   }
 #endif
 
   type_ = cursor_info.type;
   hotspot_ = cursor_info.hotSpot;
   if (IsCustom())
     SetCustomData(cursor_info.customImage);
+  ClampHotspot();
 }
 
 void WebCursor::GetCursorInfo(WebCursorInfo* cursor_info) const {
   cursor_info->type = static_cast<WebCursorInfo::Type>(type_);
   cursor_info->hotSpot = hotspot_;
   ImageFromCustomData(&cursor_info->customImage);
 
 #if defined(OS_WIN)
   cursor_info->externalHandle = external_cursor_;
 #endif
@@ skipping 23 matching lines @@
 
   // The * 4 is because the expected format is an array of RGBA pixel values.
   if (size_x * size_y * 4 > data_len)
     return false;
 
   type_ = type;
   hotspot_.set_x(hotspot_x);
   hotspot_.set_y(hotspot_y);
   custom_size_.set_width(size_x);
   custom_size_.set_height(size_y);
+  ClampHotspot();
 
   custom_data_.clear();
   if (data_len > 0) {
     custom_data_.resize(data_len);
     memcpy(&custom_data_[0], data, data_len);
   }
 
   return DeserializePlatformData(pickle, iter);
 }
 
@@ skipping 72 matching lines @@
   bitmap.setConfig(SkBitmap::kARGB_8888_Config,
                    custom_size_.width(),
                    custom_size_.height());
   if (!bitmap.allocPixels())
     return;
   memcpy(bitmap.getPixels(), &custom_data_[0], custom_data_.size());
 
   image->assign(bitmap);
 }
 #endif
+
+void WebCursor::ClampHotspot() {
+  if (!IsCustom())
+    return;
+
+  // Clamp the hotspot to the custom image's dimensions.
+  hotspot_.set_x(std::max(0,
+                          std::min(custom_size_.width() - 1, hotspot_.x())));
+  hotspot_.set_y(std::max(0,
+                          std::min(custom_size_.height() - 1, hotspot_.y())));
+}