Changeset 69159 in webkit

Timestamp:

Oct 5, 2010 4:15:11 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-05 Sanjeev Radhakrishnan <​sanjeevr@chromium.org>

Reviewed by Darin Fisher.

PluginDocument now holds on to the created plugin node so that the pluginNode() and pluginWidget() methods can return the correct node.
​https://bugs.webkit.org/show_bug.cgi?id=47129

• html/PluginDocument.cpp: (WebCore::PluginDocumentParser::createDocumentStructure): (WebCore::PluginDocument::pluginWidget): (WebCore::PluginDocument::pluginNode):
• html/PluginDocument.h: (WebCore::PluginDocument::setPluginNode):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/PluginDocument.cpp (modified) (4 diffs)
• html/PluginDocument.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-05  Sanjeev Radhakrishnan  <sanjeevr@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        PluginDocument now holds on to the created plugin node so that the pluginNode() and pluginWidget() methods can return the correct node.
+        https://bugs.webkit.org/show_bug.cgi?id=47129
+
+        * html/PluginDocument.cpp:
+        (WebCore::PluginDocumentParser::createDocumentStructure):
+        (WebCore::PluginDocument::pluginWidget):
+        (WebCore::PluginDocument::pluginNode):
+        * html/PluginDocument.h:
+        (WebCore::PluginDocument::setPluginNode):
+
 2010-10-05  Andreas Kling  <kling@webkit.org>
 

trunk/WebCore/html/PluginDocument.cpp

@@ -51 +51 @@
     }
 
-    static Widget* pluginWidgetFromDocument(Document*);
-    
 private:
     PluginDocumentParser(Document* document)
@@ -66 +64 @@
     HTMLEmbedElement* m_embedElement;
 };
-
-Widget* PluginDocumentParser::pluginWidgetFromDocument(Document* doc)
-{
-    ASSERT(doc);
-    RefPtr<Element> body = doc->body();
-    if (body) {
-        RefPtr<NodeList> embedNodes = body->getElementsByTagName("embed");
-        ASSERT(embedNodes && embedNodes->length());
-        Node* node = embedNodes->item(0);
-        if (node && node->renderer()) {
-            ASSERT(node->renderer()->isEmbeddedObject());
-            return toRenderEmbeddedObject(node->renderer())->widget();
-        }
-    }
-    return 0;
-}
 
 void PluginDocumentParser::createDocumentStructure()
@@ -111 +93 @@
     m_embedElement->setAttribute(srcAttr, document()->url().string());
     m_embedElement->setAttribute(typeAttr, document()->frame()->loader()->writer()->mimeType());
-    
+
+    static_cast<PluginDocument*>(document())->setPluginNode(m_embedElement);
+
     body->appendChild(embedElement, ec);    
 }
@@ -160 +144 @@
 Widget* PluginDocument::pluginWidget()
 {
-    return PluginDocumentParser::pluginWidgetFromDocument(this);
+    if (m_pluginNode && m_pluginNode->renderer()) {
+        ASSERT(m_pluginNode->renderer()->isEmbeddedObject());
+        return toRenderEmbeddedObject(m_pluginNode->renderer())->widget();
+    }
+    return 0;
 }
 
 Node* PluginDocument::pluginNode()
 {
-    RefPtr<Element> body_element = body();
-    if (body_element)
-        return body_element->firstChild();
-
-    return 0;
+    return m_pluginNode.get();
 }
 

trunk/WebCore/html/PluginDocument.h

@@ -39 +39 @@
     }
 
+    void setPluginNode(Node* pluginNode) { m_pluginNode = pluginNode; }
+
     Widget* pluginWidget();
     Node* pluginNode();
@@ -56 +58 @@
 
     bool m_shouldLoadPluginManually;
+    RefPtr<Node> m_pluginNode;
 };