Remove <picture> and <source>.

sky/engine/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
  * 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 "config.h"
 #include "core/html/HTMLImageElement.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/HTMLNames.h"
 #include "core/MediaTypeNames.h"
+#include "core/css/MediaQueryListListener.h"
 #include "core/css/MediaQueryMatcher.h"
 #include "core/css/MediaValuesDynamic.h"
 #include "core/css/parser/SizesAttributeParser.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/fetch/ImageResource.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLAnchorElement.h"
 #include "core/html/HTMLCanvasElement.h"
-#include "core/html/HTMLSourceElement.h"
 #include "core/html/canvas/CanvasRenderingContext.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/html/parser/HTMLSrcsetParser.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/rendering/RenderImage.h"
 #include "platform/MIMETypeRegistry.h"
 #include "platform/RuntimeEnabledFeatures.h"
 
 namespace blink {
 
@@ skipping 127 matching lines @@
     // lets figure out the alt text.. magic stuff
     // http://www.w3.org/TR/1998/REC-html40-19980424/appendix/notes.html#altgen
     // also heavily discussed by Hixie on bugzilla
     const AtomicString& alt = getAttribute(HTMLNames::altAttr);
     if (!alt.isNull())
         return alt;
     // fall back to title attribute
     return getAttribute(HTMLNames::titleAttr);
 }
 
-static bool supportedImageType(const String& type)
-{
-    return MIMETypeRegistry::isSupportedImagePrefixedMIMEType(type);
-}
-
-// http://picture.responsiveimages.org/#update-source-set
-ImageCandidate HTMLImageElement::findBestFitImageFromPictureParent()
-{
-    ASSERT(isMainThread());
-    Node* parent = parentNode();
-    if (!parent || !isHTMLPictureElement(*parent))
-        return ImageCandidate();
-    for (Node* child = parent->firstChild(); child; child = child->nextSibling()) {
-        if (child == this)
-            return ImageCandidate();
-
-        if (!isHTMLSourceElement(*child))
-            continue;
-
-        HTMLSourceElement* source = toHTMLSourceElement(child);
-        if (!source->getAttribute(HTMLNames::srcAttr).isNull())
-            UseCounter::countDeprecation(document(), UseCounter::PictureSourceSrc);
-        String srcset = source->getAttribute(HTMLNames::srcsetAttr);
-        if (srcset.isEmpty())
-            continue;
-        String type = source->getAttribute(HTMLNames::typeAttr);
-        if (!type.isEmpty() && !supportedImageType(type))
-            continue;
-
-        if (!source->mediaQueryMatches())
-            continue;
-
-        String sizes = source->getAttribute(HTMLNames::sizesAttr);
-        if (!sizes.isNull())
-            UseCounter::count(document(), UseCounter::Sizes);
-        SizesAttributeParser parser = SizesAttributeParser(MediaValuesDynamic::create(document()), sizes);
-        unsigned effectiveSize = parser.length();
-        m_effectiveSizeViewportDependant = parser.viewportDependant();
-        ImageCandidate candidate = bestFitSourceForSrcsetAttribute(document().devicePixelRatio(), effectiveSize, source->getAttribute(HTMLNames::srcsetAttr));
-        if (candidate.isEmpty())
-            continue;
-        return candidate;
-    }
-    return ImageCandidate();
-}
-
 RenderObject* HTMLImageElement::createRenderer(RenderStyle* style)
 {
     RenderImage* image = new RenderImage(this);
     image->setImageResource(RenderImageResource::create());
     image->setImageDevicePixelRatio(m_imageDevicePixelRatio);
     return image;
 }
 
 bool HTMLImageElement::canStartSelection() const
 {
@@ skipping 21 matching lines @@
             renderImageResource->setImageResource(imageLoader().image());
 
     }
 }
 
 Node::InsertionNotificationRequest HTMLImageElement::insertedInto(ContainerNode* insertionPoint)
 {
     if (m_listener)
         document().mediaQueryMatcher().addViewportListener(m_listener.get());
 
-    bool imageWasModified = false;
-    if (RuntimeEnabledFeatures::pictureEnabled()) {
-        ImageCandidate candidate = findBestFitImageFromPictureParent();
-        if (!candidate.isEmpty()) {
-            setBestFitURLAndDPRFromImageCandidate(candidate);
-            imageWasModified = true;
-        }
-    }
-
     // If we have been inserted from a renderer-less document,
     // our loader may have not fetched the image, so do it now.
-    if ((insertionPoint->inDocument() && !imageLoader().image()) || imageWasModified)
+    if ((insertionPoint->inDocument() && !imageLoader().image()))
         imageLoader().updateFromElement(ImageLoader::UpdateNormal, m_elementCreatedByParser ? ImageLoader::ForceLoadImmediately : ImageLoader::LoadNormally);
 
     return HTMLElement::insertedInto(insertionPoint);
 }
 
 void HTMLImageElement::removedFrom(ContainerNode* insertionPoint)
 {
     if (m_listener)
         document().mediaQueryMatcher().removeViewportListener(m_listener.get());
     HTMLElement::removedFrom(insertionPoint);
@@ skipping 200 matching lines @@
     LayoutSize size;
     size = image->imageSizeForRenderer(renderer(), 1.0f); // FIXME: Not sure about this.
     if (renderer() && renderer()->isRenderImage() && image->image() && !image->image()->hasRelativeWidth())
         size.scale(toRenderImage(renderer())->imageDevicePixelRatio());
     return size;
 }
 
 void HTMLImageElement::selectSourceURL(ImageLoader::UpdateFromElementBehavior behavior)
 {
     bool foundURL = false;
-    if (RuntimeEnabledFeatures::pictureEnabled()) {
-        ImageCandidate candidate = findBestFitImageFromPictureParent();
-        if (!candidate.isEmpty()) {
-            setBestFitURLAndDPRFromImageCandidate(candidate);
-            foundURL = true;
-        }
-    }
-
     if (!foundURL) {

[ojan, 2014/11/06 23:00:59]

Nit: you don't need this if-statement.

         unsigned effectiveSize = 0;
         if (RuntimeEnabledFeatures::pictureSizesEnabled()) {
             String sizes = getAttribute(HTMLNames::sizesAttr);
             if (!sizes.isNull())
                 UseCounter::count(document(), UseCounter::Sizes);
             SizesAttributeParser parser = SizesAttributeParser(MediaValuesDynamic::create(document()), sizes);
             effectiveSize = parser.length();
             m_effectiveSizeViewportDependant = parser.viewportDependant();
         }
         ImageCandidate candidate = bestFitSourceForImageAttributes(
             document().devicePixelRatio(), effectiveSize,
             getAttribute(HTMLNames::srcAttr), getAttribute(HTMLNames::srcsetAttr));
         setBestFitURLAndDPRFromImageCandidate(candidate);
     }
     if (m_intrinsicSizingViewportDependant && m_effectiveSizeViewportDependant && !m_listener.get()) {
         m_listener = ViewportChangeListener::create(this);
         document().mediaQueryMatcher().addViewportListener(m_listener.get());
     }
     imageLoader().updateFromElement(behavior);
 }
 
 const KURL& HTMLImageElement::sourceURL() const
 {
     return cachedImage()->response().url();
 }
 
 }