Changeset 61942 in webkit

Timestamp:

Jun 25, 2010 10:51:03 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-06-25 Bernhard Bauer <​bauerb@chromium.org>

Reviewed by Darin Fisher.

Add plugin accessors to WebPluginContainer.
​https://bugs.webkit.org/show_bug.cgi?id=41145

• public/WebPluginContainer.h:
• src/WebPluginContainerImpl.h: (WebKit::WebPluginContainerImpl::setPlugin):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebPluginContainer.h (modified) (2 diffs)
• src/WebPluginContainerImpl.h (modified) (2 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-25  Bernhard Bauer  <bauerb@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Add plugin accessors to WebPluginContainer.
+        https://bugs.webkit.org/show_bug.cgi?id=41145
+
+        * public/WebPluginContainer.h:
+        * src/WebPluginContainerImpl.h:
+        (WebKit::WebPluginContainerImpl::setPlugin):
+
 2010-06-25  Sterling Swigart  <sswigart@google.com>
 

trunk/WebKit/chromium/public/WebPluginContainer.h

@@ -37 +37 @@
 
 class WebElement;
+class WebPlugin;
 class WebString;
 class WebURL;
@@ -78 +79 @@
         const WebURLRequest&, const WebString& target, bool notifyNeeded, void* notifyData) = 0;
 
+    virtual WebPlugin* plugin() = 0;
+    virtual void setPlugin(WebPlugin*) = 0;
+
 protected:
     ~WebPluginContainer() { }

trunk/WebKit/chromium/src/WebPluginContainerImpl.h

@@ -85 +85 @@
     virtual void loadFrameRequest(const WebURLRequest&, const WebString& target, bool notifyNeeded, void* notifyData);
 
+    // This cannot be null.
+    WebPlugin* plugin() { return m_webPlugin; }
+    void setPlugin(WebPlugin* plugin) { m_webPlugin = plugin; }
+
     // Printing interface. The plugin can support custom printing
     // (which means it controls the layout, number of pages etc).
@@ -106 +110 @@
 
     NPObject* scriptableObject();
-
-    // This cannot be null.
-    WebPlugin* plugin() { return m_webPlugin; }
 
     void willDestroyPluginLoadObserver(WebPluginLoadObserver*);