[ImageResource 4] Split ImageResource into Resource and Image parts

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

 /*
  * Copyright (C) 2006, 2007, 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 14 matching lines @@
 
 #include "core/clipboard/DataTransfer.h"
 
 #include "core/HTMLNames.h"
 #include "core/clipboard/DataObject.h"
 #include "core/clipboard/DataTransferItem.h"
 #include "core/clipboard/DataTransferItemList.h"
 #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"
 #include "core/html/TextControlElement.h"
 #include "core/layout/LayoutImage.h"
 #include "core/layout/LayoutObject.h"
 #include "platform/DragImage.h"
 #include "platform/MIMETypeRegistry.h"
 #include "platform/clipboard/ClipboardMimeTypes.h"
 #include "platform/clipboard/ClipboardUtilities.h"
@@ skipping 175 matching lines @@
 
 void DataTransfer::clearDragImage() {
   if (!canSetDragImage())
     return;
 
   m_dragImage = nullptr;
   m_dragLoc = IntPoint();
   m_dragImageElement = nullptr;
 }
 
-void DataTransfer::setDragImageResource(ImageResource* img,
+void DataTransfer::setDragImageResource(ImageResourceContent* img,
                                         const IntPoint& loc) {
   setDragImage(img, 0, loc);
 }
 
 void DataTransfer::setDragImageElement(Node* node, const IntPoint& loc) {
   setDragImage(0, node, loc);
 }
 
 std::unique_ptr<DragImage> DataTransfer::createDragImage(
     IntPoint& loc,
     LocalFrame* frame) const {
   if (m_dragImageElement) {
     loc = m_dragLoc;
 
     return frame->nodeImage(*m_dragImageElement);
   }
   if (m_dragImage) {
     loc = m_dragLoc;
     return DragImage::create(m_dragImage->getImage());
   }
   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())
     return 0;
 
   LayoutImage* image = toLayoutImage(layoutObject);
   if (image->cachedImage() && !image->cachedImage()->errorOccurred())
     return image->cachedImage();
 
   return 0;
 }
 
 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;
 
   RefPtr<SharedBuffer> imageBuffer = cachedImage->getImage()->data();
   if (!imageBuffer || !imageBuffer->size())
     return;
 
   String imageExtension = cachedImage->getImage()->filenameExtension();
   ASSERT(!imageExtension.isEmpty());
 
@@ skipping 158 matching lines @@
 
 DataTransfer::DataTransfer(DataTransferType type,
                            DataTransferAccessPolicy policy,
                            DataObject* dataObject)
     : m_policy(policy),
       m_dropEffect("uninitialized"),
       m_effectAllowed("uninitialized"),
       m_transferType(type),
       m_dataObject(dataObject) {}
 
-void DataTransfer::setDragImage(ImageResource* image,
+void DataTransfer::setDragImage(ImageResourceContent* image,
                                 Node* node,
                                 const IntPoint& loc) {
   if (!canSetDragImage())
     return;
 
   m_dragImage = image;
   m_dragLoc = loc;
   m_dragImageElement = node;
 }
 
@@ skipping 43 matching lines @@
   }
 }
 
 DEFINE_TRACE(DataTransfer) {
   visitor->trace(m_dataObject);
   visitor->trace(m_dragImage);
   visitor->trace(m_dragImageElement);
 }
 
 }  // namespace blink