[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/core/clipboard/DataTransfer.cpp

Index: third_party/WebKit/Source/core/clipboard/DataTransfer.cpp
diff --git a/third_party/WebKit/Source/core/clipboard/DataTransfer.cpp b/third_party/WebKit/Source/core/clipboard/DataTransfer.cpp
index dcb895f94a4ae66d938eccf0a7e25fc7d568fff0..0e1817e160dd53a5e670c6c6b958f9c1553bb091 100644
--- a/third_party/WebKit/Source/core/clipboard/DataTransfer.cpp
+++ b/third_party/WebKit/Source/core/clipboard/DataTransfer.cpp
@@ -32,7 +32,7 @@
 #include "core/editing/EphemeralRange.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/serializers/Serialization.h"
-#include "core/fetch/ImageResource.h"
+#include "core/fetch/ImageResourceContent.h"
 #include "core/fileapi/FileList.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLImageElement.h"
@@ -228,7 +228,7 @@ void DataTransfer::clearDragImage() {
   m_dragImageElement = nullptr;
 }
 
-void DataTransfer::setDragImageResource(ImageResource* img,
+void DataTransfer::setDragImageResource(ImageResourceContent* img,
                                         const IntPoint& loc) {
   setDragImage(img, 0, loc);
 }
@@ -252,8 +252,8 @@ std::unique_ptr<DragImage> DataTransfer::createDragImage(
   return nullptr;
 }
 
-static ImageResource* getImageResource(Element* element) {
-  // Attempt to pull ImageResource from element
+static ImageResourceContent* getImageResourceContent(Element* element) {
+  // Attempt to pull ImageResourceContent from element
   ASSERT(element);
   LayoutObject* layoutObject = element->layoutObject();
   if (!layoutObject || !layoutObject->isImage())
@@ -270,7 +270,7 @@ static void writeImageToDataObject(DataObject* dataObject,
                                    Element* element,
                                    const KURL& url) {
   // Shove image data into a DataObject for use as a file
-  ImageResource* cachedImage = getImageResource(element);
+  ImageResourceContent* cachedImage = getImageResourceContent(element);
   if (!cachedImage || !cachedImage->getImage() || !cachedImage->isLoaded())
     return;
 
@@ -449,7 +449,7 @@ DataTransfer::DataTransfer(DataTransferType type,
       m_transferType(type),
       m_dataObject(dataObject) {}
 
-void DataTransfer::setDragImage(ImageResource* image,
+void DataTransfer::setDragImage(ImageResourceContent* image,
                                 Node* node,
                                 const IntPoint& loc) {
   if (!canSetDragImage())