[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 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
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/layout/compositing/CompositedLayerMapping.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/DOMNodeIds.h"
-#include "core/fetch/ImageResource.h"
+#include "core/fetch/ImageResourceContent.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/frame/Settings.h"
 #include "core/frame/VisualViewport.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/canvas/CanvasRenderingContext.h"
@@ skipping 2421 matching lines @@
 // compositing saves a backing store.
 bool CompositedLayerMapping::isDirectlyCompositedImage() const {
   ASSERT(layoutObject()->isImage());
   LayoutImage* imageLayoutObject = toLayoutImage(layoutObject());
 
   if (m_owningLayer.hasBoxDecorationsOrBackground() ||
       imageLayoutObject->hasClip() || imageLayoutObject->hasClipPath() ||
       imageLayoutObject->hasObjectFit())
     return false;
 
-  if (ImageResource* cachedImage = imageLayoutObject->cachedImage()) {
+  if (ImageResourceContent* cachedImage = imageLayoutObject->cachedImage()) {
     if (!cachedImage->hasImage())
       return false;
 
     Image* image = cachedImage->getImage();
     if (!image->isBitmapImage())
       return false;
 
     return true;
   }
 
@@ skipping 10 matching lines @@
   if (changeType == CanvasChanged && isAcceleratedCanvas(layoutObject())) {
     m_graphicsLayer->setContentsNeedsDisplay();
     return;
   }
 }
 
 void CompositedLayerMapping::updateImageContents() {
   ASSERT(layoutObject()->isImage());
   LayoutImage* imageLayoutObject = toLayoutImage(layoutObject());
 
-  ImageResource* cachedImage = imageLayoutObject->cachedImage();
+  ImageResourceContent* cachedImage = imageLayoutObject->cachedImage();
   if (!cachedImage)
     return;
 
   Image* image = cachedImage->getImage();
   if (!image)
     return;
 
   // This is a no-op if the layer doesn't have an inner layer for the image.
   m_graphicsLayer->setContentsToImage(
       image, LayoutObject::shouldRespectImageOrientation(imageLayoutObject));
@@ skipping 844 matching lines @@
   } else if (graphicsLayer == m_decorationOutlineLayer.get()) {
     name = "Decoration Layer";
   } else {
     ASSERT_NOT_REACHED();
   }
 
   return name;
 }
 
 }  // namespace blink