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

1 files changed, 17 insertions, 0 deletions

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);