Minor cleanup to webcursors.

content/common/cursors/webcursor.cc

 // Copyright (c) 2012 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 "content/common/cursors/webcursor.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "build/build_config.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
 
 using blink::WebCursorInfo;
 
 static const int kMaxCursorDimension = 1024;
 
 namespace content {
 
 WebCursor::WebCursor()
     : type_(WebCursorInfo::TypePointer),
       custom_scale_(1) {
-#if defined(OS_WIN)
-  external_cursor_ = NULL;
-#endif
-#if defined(USE_AURA)
-  device_scale_factor_ = 1.0f;
-#endif
   InitPlatformData();
 }
 
 WebCursor::~WebCursor() {
   Clear();
 }
 
 WebCursor::WebCursor(const WebCursor& other) {
   InitPlatformData();
   Copy(other);
 }
 
 const WebCursor& WebCursor::operator=(const WebCursor& other) {
   if (this == &other)
     return *this;
 
   Clear();
   Copy(other);
   return *this;
 }
 
 void WebCursor::InitFromCursorInfo(const CursorInfo& cursor_info) {
   Clear();
 
-#if defined(OS_WIN)
-  if (cursor_info.external_handle) {
-    InitFromExternalCursor(cursor_info.external_handle);
-    return;
-  }
-#endif
-
   type_ = cursor_info.type;
   hotspot_ = cursor_info.hotspot;
   if (IsCustom())
     SetCustomData(cursor_info.custom_image);
   custom_scale_ = cursor_info.image_scale_factor;
   CHECK(custom_scale_ > 0);
   ClampHotspot();
 }
 
 void WebCursor::GetCursorInfo(CursorInfo* cursor_info) const {
   cursor_info->type = static_cast<WebCursorInfo::Type>(type_);
   cursor_info->hotspot = hotspot_;
   ImageFromCustomData(&cursor_info->custom_image);
   cursor_info->image_scale_factor = custom_scale_;
-
-#if defined(OS_WIN)
-  cursor_info->external_handle = external_cursor_;
-#endif
 }
 
 bool WebCursor::Deserialize(base::PickleIterator* iter) {
   int type, hotspot_x, hotspot_y, size_x, size_y, data_len;
   float scale;
   const char* data;
 
   // Leave |this| unmodified unless we are going to return success.
   if (!iter->ReadInt(&type) ||
       !iter->ReadInt(&hotspot_x) ||
@@ skipping 105 matching lines @@
     if (cursor == kStandardCursor.cursor)
       return kStandardCursor.type;
   }
   return WebCursorInfo::TypeCustom;
 }
 
 void WebCursor::InitFromExternalCursor(HCURSOR cursor) {
   WebCursorInfo::Type cursor_type = ToCursorType(cursor);
 
   InitFromCursorInfo(CursorInfo(cursor_type));
-
-  if (cursor_type == WebCursorInfo::TypeCustom)

[scottmg, 2016/05/13 00:27:21]

Do we need to CHECK(cursor_type != WebCursorInfo::TypeCustom) here?

[Bret, 2016/05/13 00:53:16]

Ah nope, just forgot to delete this function.

-    external_cursor_ = cursor;
 }
 
 #endif  // defined(OS_WIN)
 
 void WebCursor::Clear() {
   type_ = WebCursorInfo::TypePointer;
   hotspot_.set_x(0);
   hotspot_.set_y(0);
   custom_size_.set_width(0);
   custom_size_.set_height(0);
@@ skipping 49 matching lines @@
     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())));
 }
 
 }  // namespace content