Refactor WebCore::DragImage.

Source/core/page/Frame.cpp

Index: Source/core/page/Frame.cpp
diff --git a/Source/core/page/Frame.cpp b/Source/core/page/Frame.cpp
index 8c0d84542630fac902acd5170401d932f31be213..2705096421ab72f0865c898064be76f7ec9f6065 100644
--- a/Source/core/page/Frame.cpp
+++ b/Source/core/page/Frame.cpp
@@ -658,10 +658,10 @@ struct ScopedFramePaintingState {
     Color backgroundColor;
 };
 
-DragImageRef Frame::nodeImage(Node* node)
+PassOwnPtr<DragImage> Frame::nodeImage(Node* node)
 {
     if (!node->renderer())
-        return 0;
+        return PassOwnPtr<DragImage>();

[jamesr, 2013/06/17 17:51:00]

return nullptr;

[jbroman, 2013/06/17 18:52:10]

Done.

 
     const ScopedFramePaintingState state(this, node);
 
@@ -675,7 +675,7 @@ DragImageRef Frame::nodeImage(Node* node)
     // Document::updateLayout may have blown away the original RenderObject.
     RenderObject* renderer = node->renderer();
     if (!renderer)
-      return 0;
+        return PassOwnPtr<DragImage>();
 
     LayoutRect topLevelRect;
     IntRect paintingRect = pixelSnappedIntRect(renderer->paintingRootRect(topLevelRect));
@@ -688,20 +688,20 @@ DragImageRef Frame::nodeImage(Node* node)
 
     OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor));
     if (!buffer)
-        return 0;
+        return PassOwnPtr<DragImage>();
     buffer->context()->translate(-paintingRect.x(), -paintingRect.y());
     buffer->context()->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.maxY()));
 
     m_view->paintContents(buffer->context(), paintingRect);
 
     RefPtr<Image> image = buffer->copyImage();
-    return createDragImageFromImage(image.get(), renderer->shouldRespectImageOrientation());
+    return DragImage::create(image.get(), renderer->shouldRespectImageOrientation());
 }
 
-DragImageRef Frame::dragImageForSelection()
+PassOwnPtr<DragImage> Frame::dragImageForSelection()
 {
     if (!selection()->isRange())
-        return 0;
+        return PassOwnPtr<DragImage>();
 
     const ScopedFramePaintingState state(this, 0);
     m_view->setPaintBehavior(PaintBehaviorSelectionOnly);
@@ -717,14 +717,14 @@ DragImageRef Frame::dragImageForSelection()
 
     OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size(), deviceScaleFactor));
     if (!buffer)
-        return 0;
+        return PassOwnPtr<DragImage>();
     buffer->context()->translate(-paintingRect.x(), -paintingRect.y());
     buffer->context()->clip(FloatRect(0, 0, paintingRect.maxX(), paintingRect.maxY()));
 
     m_view->paintContents(buffer->context(), paintingRect);
 
     RefPtr<Image> image = buffer->copyImage();
-    return createDragImageFromImage(image.get());
+    return DragImage::create(image.get());
 }
 
 } // namespace WebCore