Changeset 30203 in webkit

Timestamp:

Feb 13, 2008 9:28:37 AM (16 years ago)

Author:

Adam Roben

Message:

2008-02-13 Rodney Dawes <​dobey@wayofthemonkey.com>

Fix Bug 17220: Illogical dependency between PluginView and PluginDatabase

WebCore:

Fix Bug 17220: Illogical dependency between PluginView and
PluginDatabase

<​http://bugs.webkit.org/show_bug.cgi?id=17220>

Reviewed by Adam and Darin.

Rename PluginDatabase::createPluginView to PluginView::create, to make
the illogical dependency between the two, logical
Make PluginDatabase::findPlugin a public method
Update the includes in PluginView and PluginDatabase for the change

• plugins/PluginDatabase.h:
• plugins/PluginView.h:
• plugins/win/PluginDatabaseWin.cpp:
• plugins/win/PluginViewWin.cpp:

WebKit/win:

Fix Bug 17220: Illogical dependency between PluginView and
PluginDatabase

<​http://bugs.webkit.org/show_bug.cgi?id=17220>

Reviewed by Adam and Darin.

Update for the rename of PluginDatabase::createPluginView
to PluginView::create

• WebFrame.cpp:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/plugins/PluginDatabase.h (modified) (2 diffs)
• WebCore/plugins/PluginView.h (modified) (2 diffs)
• WebCore/plugins/win/PluginDatabaseWin.cpp (modified) (2 diffs)
• WebCore/plugins/win/PluginViewWin.cpp (modified) (2 diffs)
• WebKit/win/ChangeLog (modified) (2 diffs)
• WebKit/win/WebFrame.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-13  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Fix Bug 17220: Illogical dependency between PluginView and
+        PluginDatabase
+        
+        <http://bugs.webkit.org/show_bug.cgi?id=17220>
+
+        Reviewed by Adam and Darin.
+
+        Rename PluginDatabase::createPluginView to PluginView::create, to make
+        the illogical dependency between the two, logical
+        Make PluginDatabase::findPlugin a public method
+        Update the includes in PluginView and PluginDatabase for the change
+
+        * plugins/PluginDatabase.h:
+        * plugins/PluginView.h:
+        * plugins/win/PluginDatabaseWin.cpp:
+        * plugins/win/PluginViewWin.cpp:
+
 2008-02-13  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/plugins/PluginDatabase.h

@@ -47 +47 @@
     public:
         static PluginDatabase* installedPlugins();
-        PluginView* createPluginView(Frame* parentFrame, const IntSize&, Element* element, const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually);
 
         bool refresh();
@@ -53 +52 @@
         bool isMIMETypeRegistered(const String& mimeType);
         void addExtraPluginPath(const String&);
+
+        PluginPackage* findPlugin(const KURL&, String& mimeType);
     private:
         void setPluginPaths(const Vector<String>& paths) { m_pluginPaths = paths; }
         PluginSet getPluginsInPaths() const;
 
-        PluginPackage* findPlugin(const KURL& url, String& mimeType);
         PluginPackage* pluginForMIMEType(const String& mimeType);
         String MIMETypeForExtension(const String& extension) const;

trunk/WebCore/plugins/PluginView.h

@@ -77 +77 @@
 
     public:
-        PluginView(Frame* parentFrame, const IntSize&, PluginPackage* plugin, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually);
+        static PluginView* create(Frame* parentFrame, const IntSize&, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually);
         virtual ~PluginView();
 
@@ -139 +139 @@
 
     private:
+        PluginView(Frame* parentFrame, const IntSize&, PluginPackage*, Element*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually);
+
         void setParameters(const Vector<String>& paramNames, const Vector<String>& paramValues);
         void init();

trunk/WebCore/plugins/win/PluginDatabaseWin.cpp

@@ -27 +27 @@
 #include "PluginDatabase.h"
 
+#include "KURL.h"
+#include "Frame.h"
 #include "PluginPackage.h"
-#include "PluginView.h"
-#include "Frame.h"
 #include <windows.h>
 #include <shlwapi.h>
@@ -522 +522 @@
 }
 
-PluginView* PluginDatabase::createPluginView(Frame* parentFrame, const IntSize& size, Element* element, const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
-{
-    // if we fail to find a plugin for this MIME type, findPlugin will search for
-    // a plugin by the file extension and update the MIME type, so pass a mutable String
-    String mimeTypeCopy = mimeType;
-    PluginPackage* plugin = findPlugin(url, mimeTypeCopy);
-    
-    // No plugin was found, try refreshing the database and searching again
-    if (!plugin && refresh()) {
-        mimeTypeCopy = mimeType;
-        plugin = findPlugin(url, mimeTypeCopy);
-    }
-        
-    return new PluginView(parentFrame, size, plugin, element, url, paramNames, paramValues, mimeTypeCopy, loadManually);
-}
-
-}
+}

trunk/WebCore/plugins/win/PluginViewWin.cpp

@@ -52 +52 @@
 #include "kjs_proxy.h"
 #include "kjs_window.h"
+#include "PluginDatabase.h"
 #include "PluginDebug.h"
 #include "PluginPackage.h"
@@ -1701 +1702 @@
 }
 
+PluginView* PluginView::create(Frame* parentFrame, const IntSize& size, Element* element, const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
+{
+    // if we fail to find a plugin for this MIME type, findPlugin will search for
+    // a plugin by the file extension and update the MIME type, so pass a mutable String
+    String mimeTypeCopy = mimeType;
+    PluginPackage* plugin = PluginDatabase::installedPlugins()->findPlugin(url, mimeTypeCopy);
+
+    // No plugin was found, try refreshing the database and searching again
+    if (!plugin && PluginDatabase::installedPlugins()->refresh()) {
+        mimeTypeCopy = mimeType;
+        plugin = PluginDatabase::installedPlugins()->findPlugin(url, mimeTypeCopy);
+    }
+
+    return new PluginView(parentFrame, size, plugin, element, url, paramNames, paramValues, mimeTypeCopy, loadManually);
+}
+
 } // namespace WebCore

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2008-02-13  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Fix Bug 17220: Illogical dependency between PluginView and
+        PluginDatabase
+        
+        <http://bugs.webkit.org/show_bug.cgi?id=17220>
+
+        Reviewed by Adam and Darin.
+
+        Update for the rename of PluginDatabase::createPluginView
+        to PluginView::create
+
+        * WebFrame.cpp:
+
 2008-02-13  Adam Roben  <aroben@apple.com>
 
@@ -162 +176 @@
         Add stub.
         
+
 2008-02-07  Ada Chan  <adachan@apple.com>
 

trunk/WebKit/win/WebFrame.cpp

@@ -2334 +2334 @@
 Widget* WebFrame::createPlugin(const IntSize& pluginSize, Element* element, const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
 {
-    PluginView* pluginView = PluginDatabase::installedPlugins()->createPluginView(core(this), pluginSize, element, url, paramNames, paramValues, mimeType, loadManually);
+    PluginView* pluginView = PluginView::create(core(this), pluginSize, element, url, paramNames, paramValues, mimeType, loadManually);
 
     if (pluginView->status() == PluginStatusLoadedSuccessfully)
@@ -2404 +2404 @@
 Widget* WebFrame::createJavaAppletWidget(const IntSize& pluginSize, Element* element, const KURL& /*baseURL*/, const Vector<String>& paramNames, const Vector<String>& paramValues)
 {
-    PluginView* pluginView = PluginDatabase::installedPlugins()->
-        createPluginView(core(this), pluginSize, element, KURL(), paramNames, paramValues, "application/x-java-applet", false);
+    PluginView* pluginView = PluginView::create(core(this), pluginSize, element, KURL(), paramNames, paramValues, "application/x-java-applet", false);
 
     // Check if the plugin can be loaded successfully