[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/core/html/ImageDocument.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 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 130 matching lines @@
 void ImageDocumentParser::appendBytes(const char* data, size_t length) {
   if (!length)
     return;
 
   LocalFrame* frame = document()->frame();
   Settings* settings = frame->settings();
   if (!frame->loader().client()->allowImage(
           !settings || settings->imagesEnabled(), document()->url()))
     return;
 
-  if (document()->cachedImage()) {
+  if (document()->cachedImageResourceDeprecated()) {
     RELEASE_ASSERT(length <= std::numeric_limits<unsigned>::max());
     // If decoding has already failed, there's no point in sending additional
     // data to the ImageResource.
-    if (document()->cachedImage()->getStatus() != Resource::DecodeError)
-      document()->cachedImage()->appendData(data, length);
+    if (document()->cachedImageResourceDeprecated()->getStatus() !=
+        Resource::DecodeError)
+      document()->cachedImageResourceDeprecated()->appendData(data, length);
   }
 
   if (!isDetached())
     document()->imageUpdated();
 }
 
 void ImageDocumentParser::finish() {
-  if (!isStopped() && document()->imageElement() && document()->cachedImage()) {
-    ImageResource* cachedImage = document()->cachedImage();
+  if (!isStopped() && document()->imageElement() &&
+      document()->cachedImageResourceDeprecated()) {
+    // TODO(hiroshige): Use ImageResourceContent instead of ImageResource.
+    ImageResource* cachedImage = document()->cachedImageResourceDeprecated();
     DocumentLoader* loader = document()->loader();
     cachedImage->setResponse(loader->response());
     cachedImage->finish(loader->timing().responseEnd());
 
     // Report the natural image size in the page title, regardless of zoom
     // level.  At a zoom level of 1 the image is guaranteed to have an integer
     // size.
     IntSize size = flooredIntSize(cachedImageSize(document()->imageElement()));
     if (size.width()) {
       // Compute the title, we use the decoded filename of the resource, falling
@@ skipping 81 matching lines @@
     body->setAttribute(styleAttr, "margin: 0px;");
   }
 
   willInsertBody();
 
   m_imageElement = HTMLImageElement::create(*this);
   updateImageStyle();
   m_imageElement->setLoadingImageDocument();
   m_imageElement->setSrc(url().getString());
   body->appendChild(m_imageElement.get());
-  if (loader() && m_imageElement->cachedImage())
-    m_imageElement->cachedImage()->responseReceived(loader()->response(),
-                                                    nullptr);
+  if (loader() && m_imageElement->cachedImageResourceForImageDocument()) {
+    m_imageElement->cachedImageResourceForImageDocument()->responseReceived(
+        loader()->response(), nullptr);
+  }
 
   if (shouldShrinkToFit()) {
     // Add event listeners
     EventListener* listener = ImageEventListener::create(this);
     if (LocalDOMWindow* domWindow = this->domWindow())
       domWindow->addEventListener(EventTypeNames::resize, listener, false);
 
     if (m_shrinkToFitMode == Desktop) {
       m_imageElement->addEventListener(EventTypeNames::click, listener, false);
     } else if (m_shrinkToFitMode == Viewport) {
@@ skipping 278 matching lines @@
       resizeImageToFit();
   } else {
     // If the image isn't resized but needs to be, then resize it.
     if (!fitsInWindow) {
       resizeImageToFit();
       m_didShrinkImage = true;
     }
   }
 }
 
-ImageResource* ImageDocument::cachedImage() {
+ImageResourceContent* ImageDocument::cachedImage() {
   if (!m_imageElement) {
     createDocumentStructure();
     if (isStopped()) {
       m_imageElement = nullptr;
       return nullptr;
     }
   }
 
   return m_imageElement->cachedImage();
 }
 
+ImageResource* ImageDocument::cachedImageResourceDeprecated() {
+  if (!m_imageElement) {
+    createDocumentStructure();
+    if (isStopped()) {
+      m_imageElement = nullptr;
+      return nullptr;
+    }
+  }
+
+  return m_imageElement->cachedImageResourceForImageDocument();
+}
+
 bool ImageDocument::shouldShrinkToFit() const {
   return frame()->isMainFrame();
 }
 
 DEFINE_TRACE(ImageDocument) {
   visitor->trace(m_divElement);
   visitor->trace(m_imageElement);
   HTMLDocument::trace(visitor);
 }
 
@@ skipping 13 matching lines @@
 }
 
 bool ImageEventListener::operator==(const EventListener& listener) const {
   if (const ImageEventListener* imageEventListener =
           ImageEventListener::cast(&listener))
     return m_doc == imageEventListener->m_doc;
   return false;
 }
 
 }  // namespace blink