Start using WebCursorInfo from the WebKit API. WebCursorInfo is a

lightweight struct containing a description of a cursor that the
embedder should render.

WebCursor still exists.  Instead of WebCursor initializing from a
PlatformCursor, it now initializes from a WebCursorInfo.

TEST=none
BUG=10039
R=jam

Review URL: http://codereview.chromium.org/155172

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20194 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 162 insertions, 6 deletions

diff --git a/webkit/api/public/WebCursorInfo.h b/webkit/api/public/WebCursorInfo.h
index c1930de..194e33b 100644
--- a/webkit/api/public/WebCursorInfo.h
+++ b/webkit/api/public/WebCursorInfo.h
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ -14,7 +14,7 @@
  *     * Neither the name of Google Inc. nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -31,11 +31,13 @@
 #ifndef WebCursorInfo_h
 #define WebCursorInfo_h
 
-#error "This header file is still a work in progress; do not include!"
-
 #include "WebImage.h"
 #include "WebPoint.h"
 
+#if WEBKIT_IMPLEMENTATION
+namespace WebCore { class Cursor; }
+#endif
+
 #ifdef WIN32
 typedef struct HICON__* HICON;
 typedef HICON HCURSOR;
@@ -91,7 +93,7 @@ namespace WebKit {
 
         Type type;
         WebPoint hotSpot;
-        WebImage customData;
+        WebImage customImage;
 
 #ifdef WIN32
         // On Windows, TypeCustom may alternatively reference an externally
@@ -100,6 +102,18 @@ namespace WebKit {
         // responsible for managing the lifetime of this cursor handle.
         HCURSOR externalHandle;
 #endif
+
+        explicit WebCursorInfo(Type type = TypePointer)
+            : type(type)
+        {
+#ifdef WIN32
+            externalHandle = 0;
+#endif
+        }
+
+#if WEBKIT_IMPLEMENTATION
+        explicit WebCursorInfo(const WebCore::Cursor&);
+#endif
     };
 
 } // namespace WebKit
diff --git a/webkit/api/public/WebImage.h b/webkit/api/public/WebImage.h
index cef557b..7f938b5 100644
--- a/webkit/api/public/WebImage.h
+++ b/webkit/api/public/WebImage.h
@@ -39,6 +39,11 @@
 typedef struct CGImage* CGImageRef;
 #endif
 
+#if WEBKIT_IMPLEMENTATION
+namespace WebCore { class Image; }
+namespace WTF { template <typename T> class PassRefPtr; }
+#endif
+
 namespace WebKit {
     class WebData;
     struct WebSize;
@@ -68,6 +73,11 @@ namespace WebKit {
         WEBKIT_API bool isNull() const;
         WEBKIT_API WebSize size() const;
 
+#if WEBKIT_IMPLEMENTATION
+        WebImage(const WTF::PassRefPtr<WebCore::Image>&);
+        WebImage& operator=(const WTF::PassRefPtr<WebCore::Image>&);
+#endif
+
 #if WEBKIT_USING_SKIA
         WebImage(const SkBitmap& bitmap) : m_bitmap(bitmap) { }
 
diff --git a/webkit/api/src/WebCursorInfo.cpp b/webkit/api/src/WebCursorInfo.cpp
new file mode 100644
index 0000000..73f42b0
--- /dev/null
+++ b/webkit/api/src/WebCursorInfo.cpp
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2009 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebCursorInfo.h"
+
+#include "Cursor.h"
+#include <wtf/Assertions.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+// Ensure that our publicly defined enum values never get out of sync with the
+// ones declared for use within WebCore.
+#define COMPILE_ASSERT_MATCHING_ENUM(name) \
+    COMPILE_ASSERT(int(WebCursorInfo::name) == int(PlatformCursor::name), name)
+
+COMPILE_ASSERT_MATCHING_ENUM(TypePointer);
+COMPILE_ASSERT_MATCHING_ENUM(TypeCross);
+COMPILE_ASSERT_MATCHING_ENUM(TypeHand);
+COMPILE_ASSERT_MATCHING_ENUM(TypeIBeam);
+COMPILE_ASSERT_MATCHING_ENUM(TypeWait);
+COMPILE_ASSERT_MATCHING_ENUM(TypeHelp);
+COMPILE_ASSERT_MATCHING_ENUM(TypeEastResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeNorthResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeNorthEastResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeNorthWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeSouthResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeSouthEastResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeSouthWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeNorthSouthResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeEastWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeNorthEastSouthWestResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeNorthWestSouthEastResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeColumnResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeRowResize);
+COMPILE_ASSERT_MATCHING_ENUM(TypeMiddlePanning);
+COMPILE_ASSERT_MATCHING_ENUM(TypeEastPanning);
+COMPILE_ASSERT_MATCHING_ENUM(TypeNorthPanning);
+COMPILE_ASSERT_MATCHING_ENUM(TypeNorthEastPanning);
+COMPILE_ASSERT_MATCHING_ENUM(TypeNorthWestPanning);
+COMPILE_ASSERT_MATCHING_ENUM(TypeSouthPanning);
+COMPILE_ASSERT_MATCHING_ENUM(TypeSouthEastPanning);
+COMPILE_ASSERT_MATCHING_ENUM(TypeSouthWestPanning);
+COMPILE_ASSERT_MATCHING_ENUM(TypeWestPanning);
+COMPILE_ASSERT_MATCHING_ENUM(TypeMove);
+COMPILE_ASSERT_MATCHING_ENUM(TypeVerticalText);
+COMPILE_ASSERT_MATCHING_ENUM(TypeCell);
+COMPILE_ASSERT_MATCHING_ENUM(TypeContextMenu);
+COMPILE_ASSERT_MATCHING_ENUM(TypeAlias);
+COMPILE_ASSERT_MATCHING_ENUM(TypeProgress);
+COMPILE_ASSERT_MATCHING_ENUM(TypeNoDrop);
+COMPILE_ASSERT_MATCHING_ENUM(TypeCopy);
+COMPILE_ASSERT_MATCHING_ENUM(TypeNone);
+COMPILE_ASSERT_MATCHING_ENUM(TypeNotAllowed);
+COMPILE_ASSERT_MATCHING_ENUM(TypeZoomIn);
+COMPILE_ASSERT_MATCHING_ENUM(TypeZoomOut);
+COMPILE_ASSERT_MATCHING_ENUM(TypeCustom);
+
+WebCursorInfo::WebCursorInfo(const Cursor& cursor)
+{
+    type = static_cast<Type>(cursor.impl().type());
+    hotSpot = cursor.impl().hotSpot();
+    customImage = cursor.impl().customImage();
+#ifdef WIN32
+    externalHandle = 0;
+#endif
+}
+
+} // namespace WebKit
diff --git a/webkit/api/src/WebImageCG.cpp b/webkit/api/src/WebImageCG.cpp
index 3cf1bad..34cee01 100644
--- a/webkit/api/src/WebImageCG.cpp
+++ b/webkit/api/src/WebImageCG.cpp
@@ -36,6 +36,7 @@
 #include "WebData.h"
 #include "WebSize.h"
 
+#include "Image.h"
 #include "ImageSource.h"
 #include "SharedBuffer.h"
 #include <wtf/PassRefPtr.h>
@@ -83,6 +84,22 @@ WebSize WebImage::size() const
     return WebSize(CGImageGetWidth(m_imageRef), CGImageGetHeight(m_imageRef));
 }
 
+WebImage::WebImage(const PassRefPtr<Image>& image)
+    : m_imageRef(0)
+{
+    if (image.get())
+        assign(image->nativeImageForCurrentFrame());
+}
+
+WebImage& WebImage::operator=(const PassRefPtr<Image>& image)
+{
+    if (image.get())
+        assign(image->nativeImageForCurrentFrame());
+    else
+        reset();
+    return *this;
+}
+
 void WebImage::assign(CGImageRef imageRef)
 {
     CGImageRelease(m_imageRef);
diff --git a/webkit/api/src/WebImageSkia.cpp b/webkit/api/src/WebImageSkia.cpp
index 5519166..96399920 100644
--- a/webkit/api/src/WebImageSkia.cpp
+++ b/webkit/api/src/WebImageSkia.cpp
@@ -34,6 +34,7 @@
 #include "WebData.h"
 #include "WebSize.h"
 
+#include "Image.h"
 #include "ImageSourceSkia.h"
 #include "NativeImageSkia.h"
 #include "SharedBuffer.h"
@@ -78,4 +79,19 @@ WebSize WebImage::size() const
     return WebSize(m_bitmap.width(), m_bitmap.height());
 }
 
+WebImage::WebImage(const PassRefPtr<Image>& image)
+{
+    operator=(image);
+}
+
+WebImage& WebImage::operator=(const PassRefPtr<Image>& image)
+{
+    NativeImagePtr p;
+    if (image.get() && (p = image->nativeImageForCurrentFrame()))
+        assign(*p);
+    else
+        reset();
+    return *this;
+}
+
 } // namespace WebKit