[ImageResource 4] Split ImageResource into Resource and Image parts

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/html/HTMLImageLoader.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/Element.h"
 #include "core/events/Event.h"
-#include "core/fetch/ImageResource.h"
+#include "core/fetch/ImageResourceContent.h"
 #include "core/fetch/ResourceLoadingLog.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLObjectElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
@@ skipping 25 matching lines @@
     toHTMLInputElement(element)->ensureFallbackContent();
 }
 
 void HTMLImageLoader::noImageResourceToLoad() {
   // FIXME: Use fallback content even when there is no alt-text. The only
   // blocker is the large amount of rebaselining it requires.
   if (!toHTMLElement(element())->altText().isEmpty())
     loadFallbackContentForElement(element());
 }
 
-void HTMLImageLoader::imageNotifyFinished(ImageResource*) {
-  ImageResource* cachedImage = image();
+void HTMLImageLoader::imageNotifyFinished(ImageResourceContent*) {
+  ImageResourceContent* cachedImage = image();
   Element* element = this->element();
   ImageLoader::imageNotifyFinished(cachedImage);
 
   bool loadError = cachedImage->errorOccurred();
   if (isHTMLImageElement(*element)) {
     if (loadError)
       ensureFallbackContent();
     else
       toHTMLImageElement(element)->ensurePrimaryContent();
   }
 
   if (isHTMLInputElement(*element)) {
     if (loadError)
       ensureFallbackContent();
     else
       toHTMLInputElement(element)->ensurePrimaryContent();
   }
 
   if ((loadError || cachedImage->response().httpStatusCode() >= 400) &&
       isHTMLObjectElement(*element))
     toHTMLObjectElement(element)->renderFallbackContent();
 }
 
 void HTMLImageLoader::ensureFallbackContent() {
   loadFallbackContentForElement(element());
 }
 
 }  // namespace blink