Adds SVGImageElement as a CanvasImageSource

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2010 Google 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
@@ skipping 611 matching lines @@
   if (!imageLoader().imageComplete())
     return nullptr;
 
   return imageLoader().image()->getImage();
 }
 
 bool HTMLImageElement::isInteractiveContent() const {
   return fastHasAttribute(usemapAttr);
 }
 
-PassRefPtr<Image> HTMLImageElement::getSourceImageForCanvas(
-    SourceImageStatus* status,
-    AccelerationHint,
-    SnapshotReason,
-    const FloatSize& defaultObjectSize) const {
-  if (!complete() || !cachedImage()) {
-    *status = IncompleteSourceImageStatus;
-    return nullptr;
-  }
-
-  if (cachedImage()->errorOccurred()) {
-    *status = UndecodableSourceImageStatus;
-    return nullptr;
-  }
-
-  RefPtr<Image> sourceImage;
-  if (cachedImage()->getImage()->isSVGImage()) {
-    UseCounter::count(document(), UseCounter::SVGInCanvas2D);
-    SVGImage* svgImage = toSVGImage(cachedImage()->getImage());
-    IntSize imageSize =
-        roundedIntSize(svgImage->concreteObjectSize(defaultObjectSize));
-    sourceImage = SVGImageForContainer::create(
-        svgImage, imageSize, 1, document().completeURL(imageSourceURL()));
-  } else {
-    sourceImage = cachedImage()->getImage();
-  }
-
-  *status = NormalSourceImageStatus;
-  return sourceImage->imageForDefaultFrame();
-}
-
-bool HTMLImageElement::isSVGSource() const {
-  return cachedImage() && cachedImage()->getImage()->isSVGImage();
-}
-
-bool HTMLImageElement::wouldTaintOrigin(
-    SecurityOrigin* destinationSecurityOrigin) const {
-  ImageResourceContent* image = cachedImage();
-  if (!image)
-    return false;
-  return !image->isAccessAllowed(destinationSecurityOrigin);
-}
-
-FloatSize HTMLImageElement::elementSize(
-    const FloatSize& defaultObjectSize) const {
-  ImageResourceContent* image = cachedImage();
-  if (!image)
-    return FloatSize();
-
-  if (image->getImage() && image->getImage()->isSVGImage())
-    return toSVGImage(cachedImage()->getImage())
-        ->concreteObjectSize(defaultObjectSize);
-
-  return FloatSize(image->imageSize(
-      LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f));
-}
-
 FloatSize HTMLImageElement::defaultDestinationSize(
     const FloatSize& defaultObjectSize) const {
   ImageResourceContent* image = cachedImage();
   if (!image)
     return FloatSize();
 
   if (image->getImage() && image->getImage()->isSVGImage())
     return toSVGImage(cachedImage()->getImage())
         ->concreteObjectSize(defaultObjectSize);
 
@@ skipping 110 matching lines @@
   //
   // Instead of dealing with that, there's a separate check that the
   // ImageResourceContent has non-null image data associated with it, which
   // isn't folded into imageHasLoaded above.
   if ((imageHasLoaded && imageHasImage) || imageStillLoading || imageIsDocument)
     ensurePrimaryContent();
   else
     ensureCollapsedOrFallbackContent();
 }
 
-const KURL& HTMLImageElement::sourceURL() const {
-  return cachedImage()->response().url();
-}
-
 void HTMLImageElement::didAddUserAgentShadowRoot(ShadowRoot&) {
   HTMLImageFallbackHelper::createAltTextShadowTree(*this);
 }
 
 void HTMLImageElement::ensureFallbackForGeneratedContent() {
   // The special casing for generated content in createLayoutObject breaks the
   // invariant that the layout object attached to this element will always be
   // appropriate for |m_layoutDisposition|. Force recreate it.
   // TODO(engedy): Remove this hack. See: https://crbug.com/671953.
   setLayoutDisposition(LayoutDisposition::FallbackContent,
@@ skipping 47 matching lines @@
       return originalStyleForLayoutObject();
     case LayoutDisposition::FallbackContent:
       return HTMLImageFallbackHelper::customStyleForAltText(
           *this, ComputedStyle::clone(*originalStyleForLayoutObject()));
     default:
       NOTREACHED();
       return nullptr;
   }
 }
 
-bool HTMLImageElement::isOpaque() const {
-  Image* image = const_cast<HTMLImageElement*>(this)->imageContents();
-  return image && image->currentFrameKnownToBeOpaque();
-}
-
-int HTMLImageElement::sourceWidth() {
-  SourceImageStatus status;
-  FloatSize defaultObjectSize(width(), height());
-  RefPtr<Image> image = getSourceImageForCanvas(
-      &status, PreferNoAcceleration, SnapshotReasonUnknown, defaultObjectSize);
-  return image->width();
-}
-
-int HTMLImageElement::sourceHeight() {
-  SourceImageStatus status;
-  FloatSize defaultObjectSize(width(), height());
-  RefPtr<Image> image = getSourceImageForCanvas(
-      &status, PreferNoAcceleration, SnapshotReasonUnknown, defaultObjectSize);
-  return image->height();
-}
-
 IntSize HTMLImageElement::bitmapSourceSize() const {
   ImageResourceContent* image = cachedImage();
   if (!image)
     return IntSize();
   LayoutSize lSize = image->imageSize(
       LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f);
   DCHECK(lSize.fraction().isZero());
   return IntSize(lSize.width().toInt(), lSize.height().toInt());
 }
 
 void HTMLImageElement::associateWith(HTMLFormElement* form) {
   if (form && form->isConnected()) {
     m_form = form;
     m_formWasSetByParser = true;
     m_form->associate(*this);
     m_form->didAssociateByParser();
   }
 };
 
+FloatSize HTMLImageElement::sourceDefaultObjectSize() {
+  return FloatSize(width(), height());
+}
+
 }  // namespace blink