Changeset 27982 in webkit

Timestamp:

Nov 22, 2007 10:04:36 PM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Antti Koivisto.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=15811 WebKit plug-ins can re-enter WebKit under attach() <rdar://problem/5577978>

Defer plug-in loading until after attach and recalcStyle using the
post-attach callback mechanism. Netscape plug-ins are still loaded only
after layout.

• dom/ContainerNode.cpp: Made NodeCallbackQueue elements retain the Node because callbacks might delete nodes that are in the callback queue. (WebCore::ContainerNode::suspendPostAttachCallbacks): Added. Needed to prevent post-attach callbacks from being dispatched under recalcStyle(). (WebCore::ContainerNode::resumePostAttachCallbacks): Ditto. (WebCore::ContainerNode::dispatchPostAttachCallbacks): Factored out from attach(). (WebCore::ContainerNode::attach):
• dom/ContainerNode.h:
• dom/Document.cpp: (WebCore::Document::recalcStyle): Added calls to suspendPostAttachCallbacks() and resumePostAttachCallbacks().
• html/HTMLEmbedElement.cpp: (WebCore::HTMLEmbedElement::HTMLEmbedElement): (WebCore::HTMLEmbedElement::attach): Changed to queue the widget update for post-attach. (WebCore::HTMLEmbedElement::updateWidget): Added. Called by the post-attach callback.
• html/HTMLEmbedElement.h: Added an m_needWidgetUpdate member needed to prevent a double update if another plug-in's post-attach updateWidget() triggers a layout which updates the widget before this plug-in's post-attach callback is invoked. (WebCore::HTMLEmbedElement::setNeedWidgetUpdate): Added a setter for m_needWidgetUpdate.
• html/HTMLObjectElement.cpp: (WebCore::HTMLObjectElement::attach): Changed to queue the widget update for post-attach. (WebCore::HTMLObjectElement::updateWidget): Added. Called by the post-attach callback.
• html/HTMLObjectElement.h: (WebCore::HTMLObjectElement::setNeedWidgetUpdate): Added a setter for m_needWidgetUpdate.
• html/HTMLPlugInElement.cpp: (WebCore::HTMLPlugInElement::updateWidgetCallback): Added.
• html/HTMLPlugInElement.h: (WebCore::HTMLPlugInElement::updateWidget):
• rendering/RenderPartObject.cpp: (WebCore::RenderPartObject::updateWidget): Added calls to setNeedWidgetUpdate(false) so that if this method is called from FrameView::layout() during post-attach dispatch of another plug-in, it will not be called again when this plug-in's post-attach callback is dispatched.
• rendering/RenderPartObject.h: (WebCore::RenderPartObject::updateWidget) Renamed argument to match the method definition.

WebKit/mac:

Reviewed by Antti Koivisto.

• ​http://bugs.webkit.org/show_bug.cgi?id=15811 WebKit plug-ins can re-enter WebKit under attach() <rdar://problem/5577978>

• Plugins/WebNullPluginView.mm: (-[WebNullPluginView viewDidMoveToWindow]): Removed workaround for the above bug that added as part of fixing <​http://bugs.webkit.org/show_bug.cgi?id=15804>.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/ContainerNode.cpp (modified) (4 diffs)
• WebCore/dom/ContainerNode.h (modified) (2 diffs)
• WebCore/dom/Document.cpp (modified) (2 diffs)
• WebCore/html/HTMLEmbedElement.cpp (modified) (3 diffs)
• WebCore/html/HTMLEmbedElement.h (modified) (2 diffs)
• WebCore/html/HTMLObjectElement.cpp (modified) (1 diff)
• WebCore/html/HTMLObjectElement.h (modified) (1 diff)
• WebCore/html/HTMLPlugInElement.cpp (modified) (1 diff)
• WebCore/html/HTMLPlugInElement.h (modified) (2 diffs)
• WebCore/rendering/RenderPartObject.cpp (modified) (2 diffs)
• WebCore/rendering/RenderPartObject.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Plugins/WebNullPluginView.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-11-22  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Antti Koivisto.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=15811
+          WebKit plug-ins can re-enter WebKit under attach()
+          <rdar://problem/5577978>
+
+        Defer plug-in loading until after attach and recalcStyle using the
+        post-attach callback mechanism. Netscape plug-ins are still loaded only
+        after layout.
+
+        * dom/ContainerNode.cpp:
+        Made NodeCallbackQueue elements retain the Node because callbacks might
+        delete nodes that are in the callback queue.
+        (WebCore::ContainerNode::suspendPostAttachCallbacks): Added. Needed to
+        prevent post-attach callbacks from being dispatched under recalcStyle().
+        (WebCore::ContainerNode::resumePostAttachCallbacks): Ditto.
+        (WebCore::ContainerNode::dispatchPostAttachCallbacks): Factored out from
+        attach().
+        (WebCore::ContainerNode::attach):
+        * dom/ContainerNode.h:
+        * dom/Document.cpp:
+        (WebCore::Document::recalcStyle): Added calls to
+        suspendPostAttachCallbacks() and resumePostAttachCallbacks().
+        * html/HTMLEmbedElement.cpp:
+        (WebCore::HTMLEmbedElement::HTMLEmbedElement):
+        (WebCore::HTMLEmbedElement::attach): Changed to queue the widget update
+        for post-attach.
+        (WebCore::HTMLEmbedElement::updateWidget): Added. Called by the
+        post-attach callback.
+        * html/HTMLEmbedElement.h: Added an m_needWidgetUpdate member needed to
+        prevent a double update if another plug-in's post-attach updateWidget()
+        triggers a layout which updates the widget before this plug-in's
+        post-attach callback is invoked.
+        (WebCore::HTMLEmbedElement::setNeedWidgetUpdate): Added a setter for
+        m_needWidgetUpdate.
+        * html/HTMLObjectElement.cpp:
+        (WebCore::HTMLObjectElement::attach): Changed to queue the widget update
+        for post-attach.
+        (WebCore::HTMLObjectElement::updateWidget): Added. Called by the
+        post-attach callback.
+        * html/HTMLObjectElement.h:
+        (WebCore::HTMLObjectElement::setNeedWidgetUpdate): Added a setter for
+        m_needWidgetUpdate.
+        * html/HTMLPlugInElement.cpp:
+        (WebCore::HTMLPlugInElement::updateWidgetCallback): Added.
+        * html/HTMLPlugInElement.h:
+        (WebCore::HTMLPlugInElement::updateWidget):
+        * rendering/RenderPartObject.cpp:
+        (WebCore::RenderPartObject::updateWidget): Added calls to
+        setNeedWidgetUpdate(false) so that if this method is called from
+        FrameView::layout() during post-attach dispatch of another plug-in,
+        it will not be called again when this plug-in's post-attach callback
+        is dispatched.
+        * rendering/RenderPartObject.h:
+        (WebCore::RenderPartObject::updateWidget) Renamed argument to match
+        the method definition.
+
 2007-11-22  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/dom/ContainerNode.cpp

@@ -46 +46 @@
 static void dispatchChildRemovalEvents(Node*, ExceptionCode&);
 
-typedef Vector<std::pair<NodeCallback, Node*> > NodeCallbackQueue;
+typedef Vector<std::pair<NodeCallback, RefPtr<Node> > > NodeCallbackQueue;
 static NodeCallbackQueue* s_postAttachCallbackQueue = 0;
 
@@ -585 +585 @@
 }
 
+void ContainerNode::suspendPostAttachCallbacks()
+{
+    ++s_attachDepth;
+}
+
+void ContainerNode::resumePostAttachCallbacks()
+{
+    if (s_attachDepth == 1 && s_postAttachCallbackQueue)
+        dispatchPostAttachCallbacks();
+    --s_attachDepth;
+}
+
 void ContainerNode::queuePostAttachCallback(NodeCallback callback, Node* node)
 {
@@ -590 +602 @@
         s_postAttachCallbackQueue = new NodeCallbackQueue;
     
-    s_postAttachCallbackQueue->append(std::pair<NodeCallback, Node*>(callback, node));
+    s_postAttachCallbackQueue->append(std::pair<NodeCallback, RefPtr<Node> >(callback, node));
+}
+
+void ContainerNode::dispatchPostAttachCallbacks()
+{
+    // We recalculate size() each time through the loop because a callback
+    // can add more callbacks to the end of the queue.
+    for (size_t i = 0; i < s_postAttachCallbackQueue->size(); ++i) {
+        std::pair<NodeCallback, RefPtr<Node> >& pair = (*s_postAttachCallbackQueue)[i];
+        NodeCallback callback = pair.first;
+        Node* node = pair.second.get();
+
+        callback(node);
+    }
+    s_postAttachCallbackQueue->clear();
 }
 
@@ -601 +627 @@
     EventTargetNode::attach();
 
-    if (s_attachDepth == 1) {
-        if (s_postAttachCallbackQueue) {
-            // We recalculate size() each time through the loop because a callback
-            // can add more callbacks to the end of the queue.
-            for (size_t i = 0; i < s_postAttachCallbackQueue->size(); ++i) {
-                std::pair<NodeCallback, Node*>& pair = (*s_postAttachCallbackQueue)[i];
-                NodeCallback callback = pair.first;
-                Node* node = pair.second;
-                
-                callback(node);
-            }
-            s_postAttachCallbackQueue->clear();
-        }
-    }    
+    if (s_attachDepth == 1 && s_postAttachCallbackQueue)
+        dispatchPostAttachCallbacks();
     --s_attachDepth;
 }

trunk/WebCore/dom/ContainerNode.h

@@ -69 +69 @@
 protected:
     static void queuePostAttachCallback(NodeCallback, Node*);
+    static void suspendPostAttachCallbacks();
+    static void resumePostAttachCallbacks();
 
     void setFirstChild(Node* child) { m_firstChild = child; }
@@ -74 +76 @@
     
 private:
+    static void dispatchPostAttachCallbacks();
+
     virtual Node* virtualFirstChild() const;
     virtual Node* virtualLastChild() const;

trunk/WebCore/dom/Document.cpp

@@ -1046 +1046 @@
         
     m_inStyleRecalc = true;
+    suspendPostAttachCallbacks();
     
     ASSERT(!renderer() || renderArena());
@@ -1106 +1107 @@
     setDocumentChanged(false);
     
+    resumePostAttachCallbacks();
     m_inStyleRecalc = false;
     

trunk/WebCore/html/HTMLEmbedElement.cpp

@@ -46 +46 @@
 HTMLEmbedElement::HTMLEmbedElement(Document* doc)
     : HTMLPlugInElement(embedTag, doc)
+    , m_needWidgetUpdate(false)
 {
 }
@@ -154 +155 @@
 void HTMLEmbedElement::attach()
 {
+    m_needWidgetUpdate = true;
+    queuePostAttachCallback(&HTMLPlugInElement::updateWidgetCallback, this);
     HTMLPlugInElement::attach();
-
-    if (renderer())
-        static_cast<RenderPartObject*>(renderer())->updateWidget(true);
 }
 
@@ -166 +166 @@
 #endif
     HTMLPlugInElement::detach();
+}
+
+void HTMLEmbedElement::updateWidget()
+{
+    if (m_needWidgetUpdate && renderer())
+        static_cast<RenderPartObject*>(renderer())->updateWidget(true);
 }
 

trunk/WebCore/html/HTMLEmbedElement.h

@@ -57 +57 @@
     virtual bool isURLAttribute(Attribute*) const;
 
+    virtual void updateWidget();
+    void setNeedWidgetUpdate(bool needWidgetUpdate) { m_needWidgetUpdate = needWidgetUpdate; }
+
 #if USE(JAVASCRIPTCORE_BINDINGS)
     virtual KJS::Bindings::Instance* getInstance() const;
@@ -74 +77 @@
     String m_pluginPage;
     String m_serviceType;
+    bool m_needWidgetUpdate;
 };
 

trunk/WebCore/html/HTMLObjectElement.cpp

@@ -166 +166 @@
 void HTMLObjectElement::attach()
 {
+    bool isImage = isImageType();
+
+    if (!isImage)
+        queuePostAttachCallback(&HTMLPlugInElement::updateWidgetCallback, this);
+
     HTMLPlugInElement::attach();
 
-    if (renderer() && !m_useFallbackContent) {
-        if (isImageType()) {
-            if (!m_imageLoader)
-                m_imageLoader.set(new HTMLImageLoader(this));
-            m_imageLoader->updateFromElement();
-            if (renderer()) {
-                RenderImage* imageObj = static_cast<RenderImage*>(renderer());
-                imageObj->setCachedImage(m_imageLoader->image());
-            }
-        } else {
-            if (m_needWidgetUpdate) {
-                // Set m_needWidgetUpdate to false before calling updateWidget because updateWidget may cause
-                // this method or recalcStyle (which also calls updateWidget) to be called.
-                m_needWidgetUpdate = false;
-                static_cast<RenderPartObject*>(renderer())->updateWidget(true);
-            } else {
-                m_needWidgetUpdate = true;
-                setChanged();
-            }
-        }
-    }
+    if (isImage && renderer() && !m_useFallbackContent) {
+        if (!m_imageLoader)
+            m_imageLoader.set(new HTMLImageLoader(this));
+        m_imageLoader->updateFromElement();
+        if (renderer()) {
+            RenderImage* imageObj = static_cast<RenderImage*>(renderer());
+            imageObj->setCachedImage(m_imageLoader->image());
+        }
+    }
+}
+
+void HTMLObjectElement::updateWidget()
+{
+    if (m_needWidgetUpdate && renderer() && !m_useFallbackContent && !isImageType())
+        static_cast<RenderPartObject*>(renderer())->updateWidget(true);
 }
 

trunk/WebCore/html/HTMLObjectElement.h

@@ -57 +57 @@
     virtual bool isURLAttribute(Attribute*) const;
     virtual const QualifiedName& imageSourceAttributeName() const;
+
+    virtual void updateWidget();
+    void setNeedWidgetUpdate(bool needWidgetUpdate) { m_needWidgetUpdate = needWidgetUpdate; }
 
     bool isImageType();

trunk/WebCore/html/HTMLPlugInElement.cpp

@@ -205 +205 @@
 #endif /* USE(NPOBJECT) */
 
-}
+void HTMLPlugInElement::updateWidgetCallback(Node* n)
+{
+    static_cast<HTMLPlugInElement*>(n)->updateWidget();
+}
+
+}

trunk/WebCore/html/HTMLPlugInElement.h

@@ -49 +49 @@
     virtual bool checkDTD(const Node* newChild);
 
+    virtual void updateWidget() { }
+
     String align() const;
     void setAlign(const String&);
@@ -75 +77 @@
 
 protected:
+    static void updateWidgetCallback(Node*);
+
     String oldNameAttr;
 #if USE(JAVASCRIPTCORE_BINDINGS)

trunk/WebCore/rendering/RenderPartObject.cpp

@@ -121 +121 @@
       HTMLObjectElement* o = static_cast<HTMLObjectElement*>(element());
 
+      o->setNeedWidgetUpdate(false);
       if (!o->isComplete())
         return;
@@ -230 +231 @@
   } else if (element()->hasTagName(embedTag)) {
       HTMLEmbedElement *o = static_cast<HTMLEmbedElement*>(element());
+      o->setNeedWidgetUpdate(false);
       url = o->url;
       serviceType = o->m_serviceType;

trunk/WebCore/rendering/RenderPartObject.h

@@ -38 +38 @@
 
     virtual void layout();
-    void updateWidget(bool onlyCreateNonPlugins);
+    void updateWidget(bool onlyCreateNonNetscapePlugins);
 
     virtual void viewCleared();

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2007-11-22  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Antti Koivisto.
+
+        - http://bugs.webkit.org/show_bug.cgi?id=15811
+          WebKit plug-ins can re-enter WebKit under attach()
+          <rdar://problem/5577978>
+
+        * Plugins/WebNullPluginView.mm:
+        (-[WebNullPluginView viewDidMoveToWindow]): Removed workaround for the
+        above bug that added as part of fixing
+        <http://bugs.webkit.org/show_bug.cgi?id=15804>.
+
 2007-11-21  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKit/mac/Plugins/WebNullPluginView.mm

@@ -91 +91 @@
         return;
 
-    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(reportFailure) object:nil];
     if ([self window])
-        [self performSelector:@selector(reportFailure) withObject:nil afterDelay:0.0];
+        [self reportFailure];
 }