Changeset 195401 in webkit

Timestamp:

Jan 20, 2016, 11:16:57 PM (11 years ago)

Author:

bshafiei@apple.com

Message:

Merged r195132. rdar://problem/24154424

Location:

branches/safari-601.1.46-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLImageElement.cpp (modified) (6 diffs)
• html/HTMLImageElement.h (modified) (2 diffs)
• html/HTMLPictureElement.h (modified) (1 diff)
• html/parser/HTMLConstructionSite.cpp (modified) (2 diffs)
• html/parser/HTMLPreloadScanner.cpp (modified) (1 diff)

branches/safari-601.1.46-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-20  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r195132.
+
+    2016-01-15  Dave Hyatt  <hyatt@apple.com>
+
+            Avoid downloading the wrong image for <picture> elements.
+            https://bugs.webkit.org/show_bug.cgi?id=153027
+
+            Reviewed by Dean Jackson.
+
+            No tests, since they are always flaky.
+
+            * html/HTMLImageElement.cpp:
+            (WebCore::HTMLImageElement::HTMLImageElement):
+            (WebCore::HTMLImageElement::~HTMLImageElement):
+            (WebCore::HTMLImageElement::createForJSConstructor):
+            (WebCore::HTMLImageElement::bestFitSourceFromPictureElement):
+            (WebCore::HTMLImageElement::insertedInto):
+            (WebCore::HTMLImageElement::removedFrom):
+            (WebCore::HTMLImageElement::pictureElement):
+            (WebCore::HTMLImageElement::setPictureElement):
+            (WebCore::HTMLImageElement::width):
+            * html/HTMLImageElement.h:
+            (WebCore::HTMLImageElement::hasShadowControls):
+            * html/HTMLPictureElement.h:
+            * html/parser/HTMLConstructionSite.cpp:
+            (WebCore::HTMLConstructionSite::createHTMLElement):
+            * html/parser/HTMLPreloadScanner.cpp:
+            (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
+
+            Images that are built underneath a <picture> element are now connected
+            to that picture element via a setPictureNode call from the parser. This
+            ensures that the correct <source> elements are examined before checking the image.
+
+            This connection between images and their picture owners is handled using a static
+            HashMap in HTMLImageElement. This connection is made both from the parser and from
+            DOM insertions, and the map is queried now instead of looking directly at the
+            image's parentNode().
+
 2016-01-20  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-601.1.46-branch/Source/WebCore/html/HTMLImageElement.cpp

@@ -54 +54 @@
 using namespace HTMLNames;
 
+typedef HashMap<const HTMLImageElement*, WeakPtr<HTMLPictureElement>> PictureOwnerMap;
+static PictureOwnerMap* gPictureOwnerMap = nullptr;
+
 HTMLImageElement::HTMLImageElement(const QualifiedName& tagName, Document& document, HTMLFormElement* form)
     : HTMLElement(tagName, document)
@@ -84 +87 @@
     if (m_form)
         m_form->removeImgElement(this);
+    setPictureElement(nullptr);
 }
 
@@ -144 +148 @@
 ImageCandidate HTMLImageElement::bestFitSourceFromPictureElement()
 {
-    auto* parent = parentNode();
-    if (!is<HTMLPictureElement>(parent))
+    auto* picture = pictureElement();
+    if (!picture)
         return { };
-    auto* picture = downcast<HTMLPictureElement>(parent);
     picture->clearViewportDependentResults();
     document().removeViewportDependentPicture(*picture);
-    for (Node* child = parent->firstChild(); child && child != this; child = child->nextSibling()) {
+    for (Node* child = picture->firstChild(); child && child != this; child = child->nextSibling()) {
         if (!is<HTMLSourceElement>(*child))
             continue;
@@ -167 +170 @@
                 continue;
         }
-        MediaQueryEvaluator evaluator(document().printing() ? "print" : "screen", document().frame(), computedStyle());
+        MediaQueryEvaluator evaluator(document().printing() ? "print" : "screen", document().frame(), document().documentElement() ? document().documentElement()->computedStyle() : nullptr);
         bool evaluation = evaluator.evalCheckingViewportDependentResults(source.mediaQuerySet(), picture->viewportDependentResults());
         if (picture->hasViewportDependentResults())
@@ -312 +315 @@
         document().addImageElementByLowercasedUsemap(*m_lowercasedUsemap.impl(), *this);
     
-    if (is<HTMLPictureElement>(parentNode()))
+    if (is<HTMLPictureElement>(parentNode())) {
+        setPictureElement(&downcast<HTMLPictureElement>(*parentNode()));
         selectImageSource();
-    
+    }
+
     // If we have been inserted from a renderer-less document,
     // our loader may have not fetched the image, so do it now.
@@ -330 +335 @@
     if (insertionPoint.inDocument() && !m_lowercasedUsemap.isNull())
         document().removeImageElementByLowercasedUsemap(*m_lowercasedUsemap.impl(), *this);
-
+    
+    if (is<HTMLPictureElement>(parentNode()))
+        setPictureElement(nullptr);
+    
     m_form = 0;
     HTMLElement::removedFrom(insertionPoint);
 }
 
+HTMLPictureElement* HTMLImageElement::pictureElement() const
+{
+    if (!gPictureOwnerMap || !gPictureOwnerMap->contains(this))
+        return nullptr;
+    HTMLPictureElement* result = gPictureOwnerMap->get(this).get();
+    if (!result)
+        gPictureOwnerMap->remove(this);
+    return result;
+}
+    
+void HTMLImageElement::setPictureElement(HTMLPictureElement* pictureElement)
+{
+    if (!pictureElement) {
+        if (gPictureOwnerMap)
+            gPictureOwnerMap->remove(this);
+        return;
+    }
+    
+    if (!gPictureOwnerMap)
+        gPictureOwnerMap = new PictureOwnerMap();
+    gPictureOwnerMap->add(this, pictureElement->createWeakPtr());
+}
+    
 int HTMLImageElement::width(bool ignorePendingStylesheets)
 {

branches/safari-601.1.46-branch/Source/WebCore/html/HTMLImageElement.h

@@ -90 +90 @@
 
     bool hasShadowControls() const { return m_experimentalImageMenuEnabled; }
+    
+    HTMLPictureElement* pictureElement() const;
+    void setPictureElement(HTMLPictureElement*);
 
 protected:
@@ -129 +132 @@
     HTMLImageLoader m_imageLoader;
     HTMLFormElement* m_form;
+
     CompositeOperator m_compositeOperator;
     AtomicString m_bestFitImageURL;

branches/safari-601.1.46-branch/Source/WebCore/html/HTMLPictureElement.h

@@ -47 +47 @@
     bool viewportChangeAffectedPicture();
 
+    WeakPtr<HTMLPictureElement> createWeakPtr() { return m_weakFactory.createWeakPtr(); }
+
 private:
     HTMLPictureElement(const QualifiedName&, Document&);
     
+    WeakPtrFactory<HTMLPictureElement> m_weakFactory { this };
     Vector<std::unique_ptr<MediaQueryResult>> m_viewportDependentMediaQueryResults;
 

branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLConstructionSite.cpp

@@ -37 +37 @@
 #include "HTMLFormElement.h"
 #include "HTMLHtmlElement.h"
+#include "HTMLImageElement.h"
 #include "HTMLOptGroupElement.h"
 #include "HTMLOptionElement.h"
 #include "HTMLParserIdioms.h"
+#include "HTMLPictureElement.h"
 #include "HTMLScriptElement.h"
 #include "HTMLTemplateElement.h"
@@ -642 +644 @@
     bool insideTemplateElement = !ownerDocument.frame();
     RefPtr<Element> element = HTMLElementFactory::createElement(tagName, ownerDocument, insideTemplateElement ? nullptr : form(), true);
+    
+    // FIXME: This is a hack to connect images to pictures before the image has
+    // been inserted into the document. It can be removed once asynchronous image
+    // loading is working.
+    if (is<HTMLPictureElement>(currentNode()) && is<HTMLImageElement>(*element.get()))
+        downcast<HTMLImageElement>(*element.get()).setPictureElement(&downcast<HTMLPictureElement>(currentNode()));
+
     setAttributes(element.get(), token, m_parserContentPolicy);
     ASSERT(element->isHTMLElement());

branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLPreloadScanner.cpp

@@ -209 +209 @@
                 Ref<MediaQuerySet> mediaSet = MediaQuerySet::createAllowingDescriptionSyntax(attributeValue);
                 Vector<std::unique_ptr<MediaQueryResult>> viewportDependentMediaQueryResults;
-                MediaQueryEvaluator evaluator(document.printing() ? "print" : "screen", document.frame(), document.documentElement()->computedStyle());
+                MediaQueryEvaluator evaluator(document.printing() ? "print" : "screen", document.frame(), document.documentElement() ? document.documentElement()->computedStyle() : nullptr);
                 m_mediaMatched = evaluator.evalCheckingViewportDependentResults(mediaSet.ptr(), viewportDependentMediaQueryResults);
             }