Changeset 102983 in webkit

Timestamp:

Dec 15, 2011 2:00:09 PM (12 years ago)

Author:

eric@webkit.org

Message:

WebCore has two (disconnected) ways to keep track of updated widgets, should be unified
​https://bugs.webkit.org/show_bug.cgi?id=74367

Reviewed by Adam Barth.

It seems the FrameView updateWidgets set is needed for now,
so just making FrameView::addWidgetToUpdate mark the DOM node
as needing a widget update and later when it goes to call
updateWidget() checking first if it needs an update.

No new tests, just adding an assert.

• html/HTMLEmbedElement.cpp:

(WebCore::HTMLEmbedElement::updateWidget):

• html/HTMLObjectElement.cpp:

(WebCore::HTMLObjectElement::updateWidget):

• html/HTMLPlugInImageElement.h:

(WebCore::HTMLPlugInImageElement::needsWidgetUpdate):
(WebCore::HTMLPlugInImageElement::setNeedsWidgetUpdate):

• page/FrameView.cpp:

(WebCore::FrameView::addWidgetToUpdate):
(WebCore::FrameView::updateWidget):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLEmbedElement.cpp (modified) (1 diff)
• html/HTMLObjectElement.cpp (modified) (1 diff)
• html/HTMLPlugInImageElement.h (modified) (2 diffs)
• page/FrameView.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-15  Eric Seidel  <eric@webkit.org>
+
+        WebCore has two (disconnected) ways to keep track of updated widgets, should be unified
+        https://bugs.webkit.org/show_bug.cgi?id=74367
+
+        Reviewed by Adam Barth.
+
+        It seems the FrameView updateWidgets set is needed for now,
+        so just making FrameView::addWidgetToUpdate mark the DOM node
+        as needing a widget update and later when it goes to call
+        updateWidget() checking first if it needs an update.
+
+        No new tests, just adding an assert.
+
+        * html/HTMLEmbedElement.cpp:
+        (WebCore::HTMLEmbedElement::updateWidget):
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::updateWidget):
+        * html/HTMLPlugInImageElement.h:
+        (WebCore::HTMLPlugInImageElement::needsWidgetUpdate):
+        (WebCore::HTMLPlugInImageElement::setNeedsWidgetUpdate):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::addWidgetToUpdate):
+        (WebCore::FrameView::updateWidget):
+
 2011-12-15  Alexandru Chiculita  <achicu@adobe.com>
 

trunk/Source/WebCore/html/HTMLEmbedElement.cpp

@@ -142 +142 @@
 {
     ASSERT(!renderEmbeddedObject()->pluginCrashedOrWasMissing());
-    // FIXME: We should ASSERT(needsWidgetUpdate()), but currently
-    // FrameView::updateWidget() calls updateWidget(false) without checking if
-    // the widget actually needs updating!
+    ASSERT(needsWidgetUpdate());
     setNeedsWidgetUpdate(false);
 

trunk/Source/WebCore/html/HTMLObjectElement.cpp

@@ -291 +291 @@
 {
     ASSERT(!renderEmbeddedObject()->pluginCrashedOrWasMissing());
-    // FIXME: We should ASSERT(needsWidgetUpdate()), but currently
-    // FrameView::updateWidget() calls updateWidget(false) without checking if
-    // the widget actually needs updating!
+    ASSERT(needsWidgetUpdate());
     setNeedsWidgetUpdate(false);
     // FIXME: This should ASSERT isFinishedParsingChildren() instead.

trunk/Source/WebCore/html/HTMLPlugInImageElement.h

@@ -55 +55 @@
     bool shouldPreferPlugInsForImages() const { return m_shouldPreferPlugInsForImages; }
 
+    // Public for FrameView::addWidgetToUpdate()
+    bool needsWidgetUpdate() const { return m_needsWidgetUpdate; }
+    void setNeedsWidgetUpdate(bool needsWidgetUpdate) { m_needsWidgetUpdate = needsWidgetUpdate; }
+
 protected:
     HTMLPlugInImageElement(const QualifiedName& tagName, Document*, bool createdByParser, PreferPlugInsForImagesOption);
@@ -67 +71 @@
     virtual void attach();
     virtual void detach();
-
-    bool needsWidgetUpdate() const { return m_needsWidgetUpdate; }
-    void setNeedsWidgetUpdate(bool needsWidgetUpdate) { m_needsWidgetUpdate = needsWidgetUpdate; }
 
     bool allowedToLoadFrameURL(const String& url);

trunk/Source/WebCore/page/FrameView.cpp

@@ -1233 +1233 @@
         m_widgetUpdateSet = adoptPtr(new RenderEmbeddedObjectSet);
 
+    // Tell the DOM element that it needs a widget update.
+    Node* node = object->node();
+    if (node->hasTagName(objectTag) || node->hasTagName(embedTag)) {
+        HTMLPlugInImageElement* pluginElement = static_cast<HTMLPlugInImageElement*>(node);
+        pluginElement->setNeedsWidgetUpdate(true);
+    }
+
     m_widgetUpdateSet->add(object);
 }
@@ -2214 +2221 @@
 
     // FIXME: This could turn into a real virtual dispatch if we defined
-    // updateWidget(bool) on HTMLElement.
-    if (ownerElement->hasTagName(objectTag) || ownerElement->hasTagName(embedTag))
-        static_cast<HTMLPlugInImageElement*>(ownerElement)->updateWidget(CreateAnyWidgetType);
+    // updateWidget(PluginCreationOption) on HTMLElement.
+    if (ownerElement->hasTagName(objectTag) || ownerElement->hasTagName(embedTag)) {
+        HTMLPlugInImageElement* pluginElement = static_cast<HTMLPlugInImageElement*>(ownerElement);
+        if (pluginElement->needsWidgetUpdate())
+            pluginElement->updateWidget(CreateAnyWidgetType);
+    }
     // FIXME: It is not clear that Media elements need or want this updateWidget() call.
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)