Changeset 180966 in webkit

Timestamp:

Mar 3, 2015 5:03:15 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r180683.
​https://bugs.webkit.org/show_bug.cgi?id=142249

Broke fast/css/acid2-pixel.html (Requested by ap on #webkit).

Reverted changeset:

"Setting any of the <object> element plugin controlling
attributes does not have any affect."
​https://bugs.webkit.org/show_bug.cgi?id=141936
​http://trac.webkit.org/changeset/180683

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/as-object/resources/lime100x100.html (deleted)
• LayoutTests/svg/as-object/resources/lime100x100.png (deleted)
• LayoutTests/svg/as-object/resources/lime100x100.svg (deleted)
• LayoutTests/svg/as-object/resources/red100x100.svg (deleted)
• LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change-expected.html (deleted)
• LayoutTests/svg/as-object/svg-in-object-dynamic-attribute-change.html (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.h (modified) (1 diff)
• Source/WebCore/html/HTMLObjectElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLObjectElement.h (modified) (1 diff)
• Source/WebCore/html/HTMLPlugInImageElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-03-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r180683.
+        https://bugs.webkit.org/show_bug.cgi?id=142249
+
+        Broke fast/css/acid2-pixel.html (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "Setting any of the <object> element plugin controlling
+        attributes does not have any affect."
+        https://bugs.webkit.org/show_bug.cgi?id=141936
+        http://trac.webkit.org/changeset/180683
+
 2015-03-03  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-03  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r180683.
+        https://bugs.webkit.org/show_bug.cgi?id=142249
+
+        Broke fast/css/acid2-pixel.html (Requested by ap on #webkit).
+
+        Reverted changeset:
+
+        "Setting any of the <object> element plugin controlling
+        attributes does not have any affect."
+        https://bugs.webkit.org/show_bug.cgi?id=141936
+        http://trac.webkit.org/changeset/180683
+
 2015-03-03  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/dom/Element.h

@@ -311 +311 @@
     virtual void copyNonAttributePropertiesFromElement(const Element&) { }
 
+    void lazyReattach();
+
     virtual RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&);
     virtual bool rendererIsNeeded(const RenderStyle&);

trunk/Source/WebCore/html/HTMLObjectElement.cpp

@@ -108 +108 @@
 void HTMLObjectElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
-    bool invalidateRenderer = false;
-
     if (name == formAttr)
         formAttributeChanged();
     else if (name == typeAttr) {
         m_serviceType = value.string().left(value.find(';')).lower();
-        invalidateRenderer = !fastHasAttribute(classidAttr);
         setNeedsWidgetUpdate(true);
     } else if (name == dataAttr) {
         m_url = stripLeadingAndTrailingHTMLSpaces(value);
+        setNeedsWidgetUpdate(true);
         document().updateStyleIfNeeded();
-        if (isImageType() && renderer()) {
-            if (!m_imageLoader)
-                m_imageLoader = std::make_unique<HTMLImageLoader>(*this);
-            m_imageLoader->updateFromElementIgnoringPreviousError();
-        }
-        invalidateRenderer = !fastHasAttribute(classidAttr);
+        if (renderer()) {
+            if (isImageType()) {
+                if (!m_imageLoader)
+                    m_imageLoader = std::make_unique<HTMLImageLoader>(*this);
+                m_imageLoader->updateFromElementIgnoringPreviousError();
+            }
+        }
+    } else if (name == classidAttr)
         setNeedsWidgetUpdate(true);
-    } else if (name == classidAttr) {
-        invalidateRenderer = true;
-        setNeedsWidgetUpdate(true);
-    } else if (name == onbeforeloadAttr)
+    else if (name == onbeforeloadAttr)
         setAttributeEventListener(eventNames().beforeloadEvent, name, value);
     else
         HTMLPlugInImageElement::parseAttribute(name, value);
-
-    if (!invalidateRenderer || !inDocument() || !renderer())
-        return;
-
-    clearUseFallbackContent();
-    setNeedsStyleRecalc(SyntheticStyleChange);
 }
 

trunk/Source/WebCore/html/HTMLObjectElement.h

@@ -86 +86 @@
     bool shouldAllowQuickTimeClassIdQuirk();
     bool hasValidClassId();
-    void clearUseFallbackContent() { m_useFallbackContent = false; }
 
     virtual void refFormAssociatedElement() override { ref(); }

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -238 +238 @@
     // FIXME: There shoudn't be need to force render tree reconstruction here.
     // It is only done because loading and load event dispatching is tied to render tree construction.
-    if (!useFallbackContent() && needsWidgetUpdate() && renderer() && (displayState() != DisplayingSnapshot))
+    if (!useFallbackContent() && needsWidgetUpdate() && renderer() && !isImageType() && (displayState() != DisplayingSnapshot))
         setNeedsStyleRecalc(ReconstructRenderTree);
     return true;