Minor cleanup to webcursors.

content/common/cursors/webcursor.h

 // 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.
 
 #ifndef CONTENT_COMMON_CURSORS_WEBCURSOR_H_
 #define CONTENT_COMMON_CURSORS_WEBCURSOR_H_
 
 #include <vector>
 
-#include "base/gtest_prod_util.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
 #include "ui/display/display.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(USE_AURA)
 #include "ui/base/cursor/cursor.h"
@@ skipping 21 matching lines @@
 // This class encapsulates a cross-platform description of a cursor.  Platform
 // specific methods are provided to translate the cross-platform cursor into a
 // platform specific cursor.  It is also possible to serialize / de-serialize a
 // WebCursor.
 class CONTENT_EXPORT WebCursor {
  public:
   struct CursorInfo {
     explicit CursorInfo(blink::WebCursorInfo::Type cursor_type)
         : type(cursor_type),
           image_scale_factor(1) {
-#if defined(OS_WIN)
-      external_handle = NULL;
-#endif
     }
 
     CursorInfo()
         : type(blink::WebCursorInfo::TypePointer),
           image_scale_factor(1) {
-#if defined(OS_WIN)
-      external_handle = NULL;
-#endif
     }
 
     blink::WebCursorInfo::Type type;
     gfx::Point hotspot;
     float image_scale_factor;
     SkBitmap custom_image;
-#if defined(OS_WIN)
-    HCURSOR external_handle;
-#endif
   };
 
   WebCursor();
   ~WebCursor();
 
   // Copy constructor/assignment operator combine.
   WebCursor(const WebCursor& other);
   const WebCursor& operator=(const WebCursor& other);
 
   // Conversion from/to CursorInfo.
   void InitFromCursorInfo(const CursorInfo& cursor_info);
   void GetCursorInfo(CursorInfo* cursor_info) const;
 
   // Serialization / De-serialization
   bool Deserialize(base::PickleIterator* iter);
   bool Serialize(base::Pickle* pickle) const;
 
   // Returns true if GetCustomCursor should be used to allocate a platform
   // specific cursor object.  Otherwise GetCursor should be used.
   bool IsCustom() const;
 
   // Returns true if the current cursor object contains the same cursor as the
   // cursor object passed in. If the current cursor is a custom cursor, we also
   // compare the bitmaps to verify whether they are equal.
   bool IsEqual(const WebCursor& other) const;
 
   // Returns a native cursor representing the current WebCursor instance.
   gfx::NativeCursor GetNativeCursor();
 
-#if defined(OS_WIN)
-  // Initialize this from the given Windows cursor. The caller must ensure that
-  // the HCURSOR remains valid by not invoking the DestroyCursor/DestroyIcon
-  // APIs on it.
-  void InitFromExternalCursor(HCURSOR handle);
-#endif
-
 #if defined(USE_AURA)
   ui::PlatformCursor GetPlatformCursor();
 
   // Updates |device_scale_factor_| and |rotation_| based on |display|.
   void SetDisplayInfo(const display::Display& display);
 
   float GetCursorScaleFactor();
 
   void CreateScaledBitmapAndHotspotFromCustomData(
       SkBitmap* bitmap,
       gfx::Point* hotspot);
-  FRIEND_TEST_ALL_PREFIXES(WebCursorTest,
-                           CreateScaledBitmapAndHotspotFromCustomData);
 
 #elif defined(OS_WIN)
   // Returns a HCURSOR representing the current WebCursor instance.
-  // The ownership of the HCURSOR (does not apply to external cursors) remains
-  // with the WebCursor instance.
+  // The ownership of the HCURSOR remains with the WebCursor instance.
   HCURSOR GetCursor(HINSTANCE module_handle);
 
 #elif defined(OS_MACOSX)
   // Initialize this from the given Cocoa NSCursor.
   void InitFromNSCursor(NSCursor* cursor);
 #endif
 
  private:
   // Copies the contents of the WebCursor instance passed in.
   void Copy(const WebCursor& other);
@@ skipping 36 matching lines @@
 
   // Hotspot in cursor image in pixels.
   gfx::Point hotspot_;
 
   // Custom cursor data, as 32-bit RGBA.
   // Platform-inspecific because it can be serialized.
   gfx::Size custom_size_;  // In pixels.
   float custom_scale_;
   std::vector<char> custom_data_;
 
-#if defined(OS_WIN)
-  // An externally generated HCURSOR. We assume that it remains valid, i.e we
-  // don't attempt to copy the HCURSOR.
-  HCURSOR external_cursor_;
-#endif
-
 #if defined(USE_AURA) && (defined(USE_X11) || defined(USE_OZONE))
   // Only used for custom cursors.
   ui::PlatformCursor platform_cursor_;
 #elif defined(OS_WIN)
   // A custom cursor created from custom bitmap data by Webkit.
   HCURSOR custom_cursor_;
 #endif
 #if defined(USE_AURA)
   float device_scale_factor_;
 #endif
 
 #if defined(USE_OZONE)
   display::Display::Rotation rotation_;
   gfx::Size maximum_cursor_size_;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_CURSORS_WEBCURSOR_H_