[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/core/loader/ImageLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights
  * reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 164 matching lines @@
       << ", m_hasPendingErrorEvent=" << m_hasPendingErrorEvent;
 
   if (m_image) {
     m_image->removeObserver(this);
     m_image = nullptr;
   }
 }
 
 DEFINE_TRACE(ImageLoader) {
   visitor->trace(m_image);
+  visitor->trace(m_imageResourceForImageDocument);
   visitor->trace(m_element);
 }
 
-void ImageLoader::setImage(ImageResource* newImage) {
+void ImageLoader::setImage(ImageResourceContent* newImage) {
   setImageWithoutConsideringPendingLoadEvent(newImage);
 
   // Only consider updating the protection ref-count of the Element immediately
   // before returning from this function as doing so might result in the
   // destruction of this ImageLoader.
   updatedHasPendingEvent();
 }
 
 void ImageLoader::setImageWithoutConsideringPendingLoadEvent(
-    ImageResource* newImage) {
+    ImageResourceContent* newImage) {
   DCHECK(m_failedLoadURL.isEmpty());
-  ImageResource* oldImage = m_image.get();
+  ImageResourceContent* oldImage = m_image.get();
   if (newImage != oldImage) {
     m_image = newImage;
     if (m_hasPendingLoadEvent) {
       loadEventSender().cancelEvent(this);
       m_hasPendingLoadEvent = false;
     }
     if (m_hasPendingErrorEvent) {
       errorEventSender().cancelEvent(this);
       m_hasPendingErrorEvent = false;
     }
@@ skipping 70 matching lines @@
   m_pendingTask.reset();
   // Make sure to only decrement the count when we exit this function
   std::unique_ptr<IncrementLoadEventDelayCount> loadDelayCounter;
   loadDelayCounter.swap(m_loadDelayCounter);
 
   Document& document = m_element->document();
   if (!document.isActive())
     return;
 
   AtomicString imageSourceURL = m_element->imageSourceURL();
-  ImageResource* newImage = nullptr;
+  ImageResourceContent* newImage = nullptr;
   if (!url.isNull()) {
     // Unlike raw <img>, we block mixed content inside of <picture> or
     // <img srcset>.
     ResourceLoaderOptions resourceLoaderOptions =
         ResourceFetcher::defaultResourceOptions();
     ResourceRequest resourceRequest(url);
     if (updateBehavior == UpdateForcedReload) {
       resourceRequest.setCachePolicy(WebCachePolicy::BypassingCache);
       resourceRequest.setLoFiState(WebURLRequest::LoFiOff);
     }
 
     if (referrerPolicy != ReferrerPolicyDefault) {
       resourceRequest.setHTTPReferrer(SecurityPolicy::generateReferrer(
           referrerPolicy, url, document.outgoingReferrer()));
     }
 
     if (isHTMLPictureElement(element()->parentNode()) ||
         !element()->fastGetAttribute(HTMLNames::srcsetAttr).isNull())
       resourceRequest.setRequestContext(WebURLRequest::RequestContextImageSet);
     FetchRequest request(resourceRequest, element()->localName(),
                          resourceLoaderOptions);
     configureRequest(request, bypassBehavior, *m_element,
                      document.clientHintsPreferences());
 
     if (updateBehavior != UpdateForcedReload && document.settings() &&
         document.settings()->fetchImagePlaceholders()) {
       request.setAllowImagePlaceholder();
     }
 
-    newImage = ImageResource::fetch(request, document.fetcher());
+    newImage = ImageResourceContent::fetch(request, document.fetcher());
 
     if (!newImage && !pageIsBeingDismissed(&document)) {
       crossSiteOrCSPViolationOccurred(imageSourceURL);
       dispatchErrorEvent();
     } else {
       clearFailedLoadURL();
     }
   } else {
     if (!imageSourceURL.isNull()) {
       // Fire an error event if the url string is not empty, but the KURL is.
       dispatchErrorEvent();
     }
     noImageResourceToLoad();
   }
 
-  ImageResource* oldImage = m_image.get();
+  ImageResourceContent* oldImage = m_image.get();
   if (updateBehavior == UpdateSizeChanged && m_element->layoutObject() &&
       m_element->layoutObject()->isImage() && newImage == oldImage) {
     toLayoutImage(m_element->layoutObject())->intrinsicSizeChanged();
   } else {
     if (m_hasPendingLoadEvent) {
       loadEventSender().cancelEvent(this);
       m_hasPendingLoadEvent = false;
     }
 
     // Cancel error events that belong to the previous load, which is now
@@ skipping 42 matching lines @@
 
   if (!m_failedLoadURL.isEmpty() && imageSourceURL == m_failedLoadURL)
     return;
 
   // Prevent the creation of a ResourceLoader (and therefore a network request)
   // for ImageDocument loads. In this case, the image contents have already been
   // requested as a main resource and ImageDocumentParser will take care of
   // funneling the main resource bytes into m_image, so just create an
   // ImageResource to be populated later.
   if (m_loadingImageDocument && updateBehavior != UpdateForcedReload) {
-    setImage(
-        ImageResource::create(imageSourceToKURL(m_element->imageSourceURL())));
-    m_image->setStatus(Resource::Pending);
+    ImageResource* imageResource =
+        ImageResource::create(imageSourceToKURL(m_element->imageSourceURL()));
+    imageResource->setStatus(Resource::Pending);
+    m_imageResourceForImageDocument = imageResource;
+    setImage(imageResource->getRealContent());
     return;
   }
 
   // If we have a pending task, we have to clear it -- either we're now loading
   // immediately, or we need to reset the task's state.
   if (m_pendingTask) {
     m_pendingTask->clearLoader();
     m_pendingTask.reset();
   }
 
   KURL url = imageSourceToKURL(imageSourceURL);
   if (shouldLoadImmediately(url)) {
     doUpdateFromElement(DoNotBypassMainWorldCSP, updateBehavior, url,
                         referrerPolicy);
     return;
   }
   // Allow the idiom "img.src=''; img.src='.." to clear down the image before an
   // asynchronous load completes.
   if (imageSourceURL.isEmpty()) {
-    ImageResource* image = m_image.get();
+    ImageResourceContent* image = m_image.get();
     if (image) {
       image->removeObserver(this);
     }
     m_image = nullptr;
   }
 
   // Don't load images for inactive documents. We don't want to slow down the
   // raw HTML parsing case by loading images we don't intend to display.
   Document& document = m_element->document();
   if (document.isActive())
@@ skipping 27 matching lines @@
   if (!url.isNull()) {
     Resource* resource = memoryCache()->resourceForURL(
         url, m_element->document().fetcher()->getCacheIdentifier());
     if (resource && !resource->errorOccurred())
       return true;
   }
   return (isHTMLObjectElement(m_element) || isHTMLEmbedElement(m_element) ||
           url.protocolIsData());
 }
 
-void ImageLoader::imageNotifyFinished(ImageResource* resource) {
+void ImageLoader::imageNotifyFinished(ImageResourceContent* resource) {
   RESOURCE_LOADING_DVLOG(1)
       << "ImageLoader::imageNotifyFinished " << this
       << "; m_hasPendingLoadEvent=" << m_hasPendingLoadEvent;
 
   DCHECK(m_failedLoadURL.isEmpty());
   DCHECK_EQ(resource, m_image.get());
 
   m_imageComplete = true;
 
   // Update ImageAnimationPolicy for m_image.
   if (m_image)
     m_image->updateImageAnimationPolicy();
 
   updateLayoutObject();
 
   if (m_image && m_image->getImage() && m_image->getImage()->isSVGImage())
     toSVGImage(m_image->getImage())->updateUseCounters(element()->document());
 
   if (!m_hasPendingLoadEvent)
     return;
 
   if (resource->errorOccurred()) {
     loadEventSender().cancelEvent(this);
     m_hasPendingLoadEvent = false;
 
-    if (resource->resourceError().isAccessCheck()) {

[hiroshige, 2016/11/30 06:46:25]

TODO: I'll revert this change in next major rebase of this CL.

-      crossSiteOrCSPViolationOccurred(
-          AtomicString(resource->resourceError().failingURL()));
-    }
-
     // The error event should not fire if the image data update is a result of
     // environment change.
     // https://html.spec.whatwg.org/multipage/embedded-content.html#the-img-element:the-img-element-55
     if (!m_suppressErrorEvents)
       dispatchErrorEvent();
 
     // Only consider updating the protection ref-count of the Element
     // immediately before returning from this function as doing so might result
     // in the destruction of this ImageLoader.
     updatedHasPendingEvent();
     return;
   }
-  if (resource->wasCanceled()) {

[hiroshige, 2016/11/30 06:46:24]

TODO: This change will be done in https://codereview.chromium.org/2471133007/.

-    m_hasPendingLoadEvent = false;
-    // Only consider updating the protection ref-count of the Element
-    // immediately before returning from this function as doing so might result
-    // in the destruction of this ImageLoader.
-    updatedHasPendingEvent();
-    return;
-  }
   loadEventSender().dispatchEventSoon(this);
 }
 
 LayoutImageResource* ImageLoader::layoutImageResource() {
   LayoutObject* layoutObject = m_element->layoutObject();
 
   if (!layoutObject)
     return 0;
 
   // We don't return style generated image because it doesn't belong to the
@@ skipping 13 matching lines @@
 
 void ImageLoader::updateLayoutObject() {
   LayoutImageResource* imageResource = layoutImageResource();
 
   if (!imageResource)
     return;
 
   // Only update the layoutObject if it doesn't have an image or if what we have
   // is a complete image.  This prevents flickering in the case where a dynamic
   // change is happening between two images.
-  ImageResource* cachedImage = imageResource->cachedImage();
+  ImageResourceContent* cachedImage = imageResource->cachedImage();
   if (m_image != cachedImage && (m_imageComplete || !cachedImage))
     imageResource->setImageResource(m_image.get());
 }
 
 void ImageLoader::updatedHasPendingEvent() {
   // If an Element that does image loading is removed from the DOM the
   // load/error event for the image is still observable. As long as the
   // ImageLoader is actively loading, the Element itself needs to be ref'ed to
   // keep it from being destroyed by DOM manipulation or garbage collection. If
   // such an Element wishes for the load to stop when removed from the DOM it
@@ skipping 75 matching lines @@
 }
 
 void ImageLoader::elementDidMoveToNewDocument() {
   if (m_loadDelayCounter)
     m_loadDelayCounter->documentChanged(m_element->document());
   clearFailedLoadURL();
   setImage(0);
 }
 
 }  // namespace blink