Changeset 150700 in webkit

Timestamp:

May 25, 2013 7:48:46 PM (11 years ago)

Author:

akling@apple.com

Message:

PluginDocument::pluginNode() should be pluginElement() instead.
<​http://webkit.org/b/116774>

Reviewed by Anders Carlsson.

Source/WebCore:

Make PluginDocument hand out a HTMLPlugInElement* instead of a Node*.

• dom/Document.cpp:

(WebCore::eventTargetNodeForDocument):

• html/PluginDocument.h:
• html/PluginDocument.cpp:

(WebCore::PluginDocumentParser::createDocumentStructure):
(WebCore::PluginDocument::pluginWidget):
(WebCore::PluginDocument::setPluginElement):
(WebCore::PluginDocument::detach):

Source/WebKit2:

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::focusedPluginViewForFrame):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (2 diffs)
• WebCore/html/PluginDocument.cpp (modified) (4 diffs)
• WebCore/html/PluginDocument.h (modified) (4 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-25  Andreas Kling  <akling@apple.com>
+
+        PluginDocument::pluginNode() should be pluginElement() instead.
+        <http://webkit.org/b/116774>
+
+        Reviewed by Anders Carlsson.
+
+        Make PluginDocument hand out a HTMLPlugInElement* instead of a Node*.
+
+        * dom/Document.cpp:
+        (WebCore::eventTargetNodeForDocument):
+        * html/PluginDocument.h:
+        * html/PluginDocument.cpp:
+        (WebCore::PluginDocumentParser::createDocumentStructure):
+        (WebCore::PluginDocument::pluginWidget):
+        (WebCore::PluginDocument::setPluginElement):
+        (WebCore::PluginDocument::detach):
+
 2013-05-25  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -330 +330 @@
 __ZN7WebCore14LoaderStrategy21resourceLoadSchedulerEv
 __ZN7WebCore14LoaderStrategy25loadResourceSynchronouslyEPNS_17NetworkingContextEmRKNS_15ResourceRequestENS_17StoredCredentialsENS_22ClientCredentialPolicyERNS_13ResourceErrorERNS_16ResourceResponseERN3WTF6VectorIcLm0ENSC_15CrashOnOverflowEEE
-__ZN7WebCore14PluginDocument10pluginNodeEv
 __ZN7WebCore14PluginDocument12pluginWidgetEv
 __ZN7WebCore14ResourceBuffer12createNSDataEv

trunk/Source/WebCore/dom/Document.cpp

@@ -101 +101 @@
 #include "HTMLNames.h"
 #include "HTMLParserIdioms.h"
+#include "HTMLPlugInElement.h"
 #include "HTMLStyleElement.h"
 #include "HTMLTitleElement.h"
@@ -5771 +5772 @@
     if (!node && doc->isPluginDocument()) {
         PluginDocument* pluginDocument = toPluginDocument(doc);
-        node =  pluginDocument->pluginNode();
+        node = pluginDocument->pluginElement();
     }
     if (!node && doc->isHTMLDocument())

trunk/Source/WebCore/html/PluginDocument.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2008, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35 +35 @@
 #include "HTMLHtmlElement.h"
 #include "HTMLNames.h"
-#include "NodeList.h"
 #include "Page.h"
 #include "RawDataDocumentParser.h"
@@ -97 +96 @@
         m_embedElement->setAttribute(typeAttr, loader->writer()->mimeType());
 
-    toPluginDocument(document())->setPluginNode(m_embedElement);
+    toPluginDocument(document())->setPluginElement(m_embedElement);
 
     body->appendChild(embedElement, IGNORE_EXCEPTION);
@@ -151 +150 @@
 Widget* PluginDocument::pluginWidget()
 {
-    if (m_pluginNode && m_pluginNode->renderer()) {
-        ASSERT(m_pluginNode->renderer()->isEmbeddedObject());
-        return toRenderEmbeddedObject(m_pluginNode->renderer())->widget();
+    if (m_pluginElement && m_pluginElement->renderer()) {
+        ASSERT(m_pluginElement->renderer()->isEmbeddedObject());
+        return toRenderEmbeddedObject(m_pluginElement->renderer())->widget();
     }
     return 0;
 }
 
-Node* PluginDocument::pluginNode()
+void PluginDocument::setPluginElement(PassRefPtr<HTMLPlugInElement> element)
 {
-    return m_pluginNode.get();
+    m_pluginElement = element;
 }
 
 void PluginDocument::detach()
 {
-    // Release the plugin node so that we don't have a circular reference.
-    m_pluginNode = 0;
+    // Release the plugin Element so that we don't have a circular reference.
+    m_pluginElement = 0;
     if (FrameLoader* loader = frame()->loader())
         loader->client()->redirectDataToPlugin(0);

trunk/Source/WebCore/html/PluginDocument.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2006, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2008, 2009, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30 +30 @@
 namespace WebCore {
 
-class Node;
+class HTMLPlugInElement;
 class Widget;
 
@@ -40 +40 @@
     }
 
-    void setPluginNode(Node* pluginNode) { m_pluginNode = pluginNode; }
+    void setPluginElement(PassRefPtr<HTMLPlugInElement>);
 
     Widget* pluginWidget();
-    Node* pluginNode();
+    HTMLPlugInElement* pluginElement() { return m_pluginElement.get(); }
 
     virtual void detach() OVERRIDE;
@@ -59 +59 @@
 
     bool m_shouldLoadPluginManually;
-    RefPtr<Node> m_pluginNode;
+    RefPtr<HTMLPlugInElement> m_pluginElement;
 };
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-25  Andreas Kling  <akling@apple.com>
+
+        PluginDocument::pluginNode() should be pluginElement() instead.
+        <http://webkit.org/b/116774>
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::focusedPluginViewForFrame):
+
 2013-05-25  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -745 +745 @@
     PluginDocument* pluginDocument = static_cast<PluginDocument*>(frame->document());
 
-    if (pluginDocument->focusedNode() != pluginDocument->pluginNode())
+    if (pluginDocument->focusedNode() != pluginDocument->pluginElement())
         return 0;