Rename PluginDatabase's "PluginPaths" to "PluginDirectories"
authoraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 31 Mar 2008 16:54:22 +0000 (16:54 +0000)
committeraroben@apple.com <aroben@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 31 Mar 2008 16:54:22 +0000 (16:54 +0000)
WebCore:

        Rename PluginDatabase's "PluginPaths" to "PluginDirectories"

        The code expects these paths to all be directories, so it seems good
        to refer to them as such.

        This patch just changes "Paths" to "Directories" and "Path" to
        "Directory".

        Reviewed by Mitz Pettel.

        * platform/qt/TemporaryLinkStubs.cpp:
        * platform/wx/TemporaryLinkStubs.cpp:
        * plugins/PluginDatabase.cpp:
        (WebCore::PluginDatabase::installedPlugins):
        (WebCore::PluginDatabase::refresh):
        * plugins/PluginDatabase.h:
        (WebCore::PluginDatabase::setPluginDirectories):
        * plugins/gtk/PluginDatabaseGtk.cpp:
        (WebCore::PluginDatabase::getPluginsInDirectories):
        * plugins/win/PluginDatabaseWin.cpp:
        (WebCore::PluginDatabase::getPluginsInDirectories):
        (WebCore::safariPluginsDirectory):
        (WebCore::PluginDatabase::defaultPluginDirectories):
        (WebCore::PluginDatabase::isPreferredPluginDirectory):
        * plugins/win/PluginPackageWin.cpp:
        (WebCore::PluginPackage::compare):

WebKit/win:

        Rename IWebViewPrivate::addAdditionalPluginPath to
        addAdditionalPluginDirectory

        Reviewed by Mitz Pettel.

        * Interfaces/IWebViewPrivate.idl:
        * Interfaces/WebKit.idl: Touched to make sure the Interfaces project
        rebuilds.
        * WebView.cpp:
        (WebView::addAdditionalPluginDirectory):
        * WebView.h:

WebKitTools:

        Update for rename of an IWebViewPrivate method

        Reviewed by Mitz Pettel.

        * DumpRenderTree/win/DumpRenderTree.cpp:
        (createWebViewAndOffscreenWindow):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@31462 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
WebCore/ChangeLog
WebCore/platform/qt/TemporaryLinkStubs.cpp
WebCore/platform/wx/TemporaryLinkStubs.cpp
WebCore/plugins/PluginDatabase.cpp
WebCore/plugins/PluginDatabase.h
WebCore/plugins/gtk/PluginDatabaseGtk.cpp
WebCore/plugins/win/PluginDatabaseWin.cpp
WebCore/plugins/win/PluginPackageWin.cpp
WebKit/win/ChangeLog
WebKit/win/Interfaces/IWebViewPrivate.idl
WebKit/win/Interfaces/WebKit.idl
WebKit/win/WebView.cpp
WebKit/win/WebView.h
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp

index bb8f3e0..954ca7a 100644 (file)
@@ -1,5 +1,34 @@
 2008-03-29  Adam Roben  <aroben@apple.com>
 
+        Rename PluginDatabase's "PluginPaths" to "PluginDirectories"
+
+        The code expects these paths to all be directories, so it seems good
+        to refer to them as such.
+
+        This patch just changes "Paths" to "Directories" and "Path" to
+        "Directory".
+
+        Reviewed by Mitz Pettel.
+
+        * platform/qt/TemporaryLinkStubs.cpp:
+        * platform/wx/TemporaryLinkStubs.cpp:
+        * plugins/PluginDatabase.cpp:
+        (WebCore::PluginDatabase::installedPlugins):
+        (WebCore::PluginDatabase::refresh):
+        * plugins/PluginDatabase.h:
+        (WebCore::PluginDatabase::setPluginDirectories):
+        * plugins/gtk/PluginDatabaseGtk.cpp:
+        (WebCore::PluginDatabase::getPluginsInDirectories):
+        * plugins/win/PluginDatabaseWin.cpp:
+        (WebCore::PluginDatabase::getPluginsInDirectories):
+        (WebCore::safariPluginsDirectory):
+        (WebCore::PluginDatabase::defaultPluginDirectories):
+        (WebCore::PluginDatabase::isPreferredPluginDirectory):
+        * plugins/win/PluginPackageWin.cpp:
+        (WebCore::PluginPackage::compare):
+
+2008-03-29  Adam Roben  <aroben@apple.com>
+
         Remove PlatformFileTime
 
         This typedef is time_t on all platforms, so we can just get rid of the
index a92bb87..e56c3f7 100644 (file)
@@ -72,8 +72,8 @@
 
 using namespace WebCore;
 
-PluginSet PluginDatabase::getPluginsInPaths() const { notImplemented(); return PluginSet(); }
-Vector<String> PluginDatabase::defaultPluginPaths() { notImplemented(); return Vector<String>(); }
+PluginSet PluginDatabase::getPluginsInDirectories() const { notImplemented(); return PluginSet(); }
+Vector<String> PluginDatabase::defaultPluginDirectories() { notImplemented(); return Vector<String>(); }
 bool PluginDatabase::isPreferredPluginPath(const String&) { notImplemented(); return false; }
 int PluginPackage::compare(const PluginPackage&) const { notImplemented(); return 0; }
 bool PluginPackage::fetchInfo() { notImplemented(); return false; }
index 20975aa..324a6a5 100755 (executable)
@@ -116,8 +116,8 @@ const WebCore::Cursor& WebCore::moveCursor() { return localCursor; }
 
 void WebCore::findWordBoundary(UChar const* str,int len,int position,int* start, int* end) { notImplemented(); *start=position; *end=position; }
 
-PluginSet PluginDatabase::getPluginsInPaths() const { notImplemented(); return PluginSet(); }
-Vector<String> PluginDatabase::defaultPluginPaths() { notImplemented(); return Vector<String>(); }
+PluginSet PluginDatabase::getPluginsInDirectories() const { notImplemented(); return PluginSet(); }
+Vector<String> PluginDatabase::defaultPluginDirectories() { notImplemented(); return Vector<String>(); }
 bool PluginDatabase::isPreferredPluginPath(const String&) { notImplemented(); return false; }
 int PluginPackage::compare(const PluginPackage&) const { notImplemented(); return 0; }
 bool PluginPackage::fetchInfo() { notImplemented(); return false; }
index dba5ef9..067c556 100644 (file)
@@ -40,7 +40,7 @@ PluginDatabase* PluginDatabase::installedPlugins()
     
     if (!plugins) {
         plugins = new PluginDatabase;
-        plugins->setPluginPaths(PluginDatabase::defaultPluginPaths());
+        plugins->setPluginDirectories(PluginDatabase::defaultPluginDirectories());
         plugins->refresh();
     }
 
@@ -57,9 +57,9 @@ bool PluginDatabase::isMIMETypeRegistered(const String& mimeType)
     return (refresh() && m_registeredMIMETypes.contains(mimeType));
 }
 
-void PluginDatabase::addExtraPluginPath(const String& path)
+void PluginDatabase::addExtraPluginDirectory(const String& directory)
 {
-    m_pluginPaths.append(path);
+    m_pluginDirectories.append(directory);
     refresh();
 }
 
@@ -70,7 +70,7 @@ bool PluginDatabase::refresh()
     bool pluginSetChanged = false;
 
     // Create a new set of plugins
-    newPlugins = getPluginsInPaths();
+    newPlugins = getPluginsInDirectories();
 
     if (!m_plugins.isEmpty()) {
         m_registeredMIMETypes.clear();
index f79b881..b54f475 100644 (file)
@@ -50,23 +50,23 @@ namespace WebCore {
         bool refresh();
         Vector<PluginPackage*> plugins() const;
         bool isMIMETypeRegistered(const String& mimeType);
-        void addExtraPluginPath(const String&);
+        void addExtraPluginDirectory(const String&);
 
-        static bool isPreferredPluginPath(const String& path);
+        static bool isPreferredPluginDirectory(const String& directory);
         static int preferredPluginCompare(const void*, const void*);
 
         PluginPackage* findPlugin(const KURL&, String& mimeType);
 
     private:
-        void setPluginPaths(const Vector<String>& paths) { m_pluginPaths = paths; }
-        PluginSet getPluginsInPaths() const;
+        void setPluginDirectories(const Vector<String>& directories) { m_pluginDirectories = directories; }
+        PluginSet getPluginsInDirectories() const;
 
         PluginPackage* pluginForMIMEType(const String& mimeType);
         String MIMETypeForExtension(const String& extension) const;
 
-        static Vector<String> defaultPluginPaths();
+        static Vector<String> defaultPluginDirectories();
 
-        Vector<String> m_pluginPaths;
+        Vector<String> m_pluginDirectories;
         HashSet<String> m_registeredMIMETypes;
         PluginSet m_plugins;
     };
index 55ca058..752059f 100644 (file)
 
 namespace WebCore {
 
-PluginSet PluginDatabase::getPluginsInPaths() const
+PluginSet PluginDatabase::getPluginsInDirectories() const
 {
     // FIXME: This should be a case insensitive set.
     HashSet<String> uniqueFilenames;
     PluginSet plugins;
 
-    Vector<String>::const_iterator end = m_pluginPaths.end();
-    for (Vector<String>::const_iterator it = m_pluginPaths.begin(); it != end; ++it) {
+    Vector<String>::const_iterator end = m_pluginDirectories.end();
+    for (Vector<String>::const_iterator it = m_pluginDirectories.begin(); it != end; ++it) {
         GDir* dir = g_dir_open((it->utf8()).data(), 0, 0);
         if (!dir)
             continue;
@@ -60,45 +60,45 @@ PluginSet PluginDatabase::getPluginsInPaths() const
     return plugins;
 }
 
-Vector<String> PluginDatabase::defaultPluginPaths()
+Vector<String> PluginDatabase::defaultPluginDirectories()
 {
-    Vector<String> paths;
-    gchar* path;
+    Vector<String> directories;
+    gchar* directory;
 
 #if defined(GDK_WINDOWING_X11)
-    path = g_build_filename(g_get_home_dir(), ".mozilla", "plugins", 0);
-    paths.append(path);
-    g_free(path);
+    directory = g_build_filename(g_get_home_dir(), ".mozilla", "plugins", 0);
+    directories.append(directory);
+    g_free(directory);
 
     const gchar* mozPath = g_getenv("MOZ_PLUGIN_PATH");
     if (mozPath) {
         gchar** pluginPaths = g_strsplit(mozPath, ":", -1);
 
         for (gint i = 0; pluginPaths[i]; i++)
-            paths.append(pluginPaths[i]);
+            directories.append(pluginPaths[i]);
 
         g_strfreev(pluginPaths);
     }
 
-    path = g_build_filename(G_DIR_SEPARATOR_S "usr", "lib", "browser", "plugins", 0);
-    paths.append(path);
-    g_free(path);
-    path = g_build_filename(G_DIR_SEPARATOR_S "usr", "local", "lib", "mozilla", "plugins", 0);
-    paths.append(path);
-    g_free (path);
-    path = g_build_filename(G_DIR_SEPARATOR_S "usr", "lib", "mozilla", "plugins", 0);
-    paths.append(path);
-    g_free (path);
+    directory = g_build_filename(G_DIR_SEPARATOR_S "usr", "lib", "browser", "plugins", 0);
+    directories.append(directory);
+    g_free(directory);
+    directory = g_build_filename(G_DIR_SEPARATOR_S "usr", "local", "lib", "mozilla", "plugins", 0);
+    directories.append(directory);
+    g_free (directory);
+    directory = g_build_filename(G_DIR_SEPARATOR_S "usr", "lib", "mozilla", "plugins", 0);
+    directories.append(directory);
+    g_free (directory);
 #elif defined(GDK_WINDOWING_WIN32)
-    path = g_build_filename(g_get_home_dir(), "Application Data", "Mozilla", "plugins", 0);
-    paths.append(path);
-    g_free(path);
+    directory = g_build_filename(g_get_home_dir(), "Application Data", "Mozilla", "plugins", 0);
+    directories.append(directory);
+    g_free(directory);
 #endif
 
-    return paths;
+    return directories;
 }
 
-bool PluginDatabase::isPreferredPluginPath(const String& path)
+bool PluginDatabase::isPreferredPluginDirectory(const String& directory)
 {
     return false;
 }
index 4404984..0a14c72 100644 (file)
@@ -77,7 +77,7 @@ static inline void addPluginsFromRegistry(HKEY rootKey, PluginSet& plugins)
     RegCloseKey(key);
 }
 
-PluginSet PluginDatabase::getPluginsInPaths() const
+PluginSet PluginDatabase::getPluginsInDirectories() const
 {
     // FIXME: This should be a case insensitive set.
     HashSet<String> uniqueFilenames;
@@ -89,8 +89,8 @@ PluginSet PluginDatabase::getPluginsInPaths() const
     RefPtr<PluginPackage> oldWMPPlugin;
     RefPtr<PluginPackage> newWMPPlugin;
 
-    Vector<String>::const_iterator end = m_pluginPaths.end();
-    for (Vector<String>::const_iterator it = m_pluginPaths.begin(); it != end; ++it) {
+    Vector<String>::const_iterator end = m_pluginDirectories.end();
+    for (Vector<String>::const_iterator it = m_pluginDirectories.begin(); it != end; ++it) {
         String pattern = *it + "\\*";
 
         hFind = FindFirstFileW(pattern.charactersWithNullTermination(), &findFileData);
@@ -180,7 +180,7 @@ static inline bool compareVersions(const Vector<int>& versionA, const Vector<int
     return false;
 }
 
-static inline void addMozillaPluginPaths(Vector<String>& paths)
+static inline void addMozillaPluginDirectories(Vector<String>& directories)
 {
     // Enumerate all Mozilla plugin directories in the registry
     HKEY key;
@@ -206,15 +206,15 @@ static inline void addMozillaPluginPaths(Vector<String>& paths)
             result = RegOpenKeyEx(key, extensionsPath.charactersWithNullTermination(), 0, KEY_READ, &extensionsKey);
 
             if (result == ERROR_SUCCESS) {
-                // Now get the plugins path
-                WCHAR pluginsPathStr[_MAX_PATH];
-                DWORD pluginsPathSize = sizeof(pluginsPathStr);
+                // Now get the plugins directory
+                WCHAR pluginsDirectoryStr[_MAX_PATH];
+                DWORD pluginsDirectorySize = sizeof(pluginsDirectoryStr);
                 DWORD type;
 
-                result = RegQueryValueEx(extensionsKey, TEXT("Plugins"), 0, &type, (LPBYTE)&pluginsPathStr, &pluginsPathSize);
+                result = RegQueryValueEx(extensionsKey, TEXT("Plugins"), 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
 
                 if (result == ERROR_SUCCESS && type == REG_SZ)
-                    paths.append(String(pluginsPathStr, pluginsPathSize / sizeof(WCHAR) - 1));
+                    directories.append(String(pluginsDirectoryStr, pluginsDirectorySize / sizeof(WCHAR) - 1));
 
                 RegCloseKey(extensionsKey);
             }
@@ -224,14 +224,14 @@ static inline void addMozillaPluginPaths(Vector<String>& paths)
     }
 }
 
-static inline void addWindowsMediaPlayerPluginPath(Vector<String>& paths)
+static inline void addWindowsMediaPlayerPluginDirectory(Vector<String>& directories)
 {
     // The new WMP Firefox plugin is installed in \PFiles\Plugins if it can't find any Firefox installs
     WCHAR pluginDirectoryStr[_MAX_PATH + 1];
     DWORD pluginDirectorySize = ::ExpandEnvironmentStringsW(TEXT("%SYSTEMDRIVE%\\PFiles\\Plugins"), pluginDirectoryStr, _countof(pluginDirectoryStr));
 
     if (pluginDirectorySize > 0 && pluginDirectorySize <= _countof(pluginDirectoryStr))
-        paths.append(String(pluginDirectoryStr, pluginDirectorySize - 1));
+        directories.append(String(pluginDirectoryStr, pluginDirectorySize - 1));
 
     DWORD type;
     WCHAR installationDirectoryStr[_MAX_PATH];
@@ -240,10 +240,10 @@ static inline void addWindowsMediaPlayerPluginPath(Vector<String>& paths)
     HRESULT result = SHGetValue(HKEY_LOCAL_MACHINE, TEXT("Software\\Microsoft\\MediaPlayer"), TEXT("Installation Directory"), &type, (LPBYTE)&installationDirectoryStr, &installationDirectorySize);
 
     if (result == ERROR_SUCCESS && type == REG_SZ)
-        paths.append(String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1));
+        directories.append(String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1));
 }
 
-static inline void addQuickTimePluginPath(Vector<String>& paths)
+static inline void addQuickTimePluginDirectory(Vector<String>& directories)
 {
     DWORD type;
     WCHAR installationDirectoryStr[_MAX_PATH];
@@ -253,11 +253,11 @@ static inline void addQuickTimePluginPath(Vector<String>& paths)
 
     if (result == ERROR_SUCCESS && type == REG_SZ) {
         String pluginDir = String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1) + "\\plugins";
-        paths.append(pluginDir);
+        directories.append(pluginDir);
     }
 }
 
-static inline void addAdobeAcrobatPluginPath(Vector<String>& paths)
+static inline void addAdobeAcrobatPluginDirectory(Vector<String>& directories)
 {
     HKEY key;
     HRESULT result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("Software\\Adobe\\Acrobat Reader"), 0, KEY_READ, &key);
@@ -294,22 +294,22 @@ static inline void addAdobeAcrobatPluginPath(Vector<String>& paths)
         result = SHGetValue(HKEY_LOCAL_MACHINE, acrobatPluginKeyPath.charactersWithNullTermination(), 0, &type, (LPBYTE)acrobatInstallPathStr, &acrobatInstallPathSize);
 
         if (result == ERROR_SUCCESS) {
-            String acrobatPluginPath = String(acrobatInstallPathStr, acrobatInstallPathSize / sizeof(WCHAR) - 1) + "\\browser";
-            paths.append(acrobatPluginPath);
+            String acrobatPluginDirectory = String(acrobatInstallPathStr, acrobatInstallPathSize / sizeof(WCHAR) - 1) + "\\browser";
+            directories.append(acrobatPluginDirectory);
         }
     }
 
     RegCloseKey(key);
 }
 
-static inline String safariPluginsPath()
+static inline String safariPluginsDirectory()
 {
     WCHAR moduleFileNameStr[_MAX_PATH];
-    static String pluginsPath;
-    static bool cachedPluginPath = false;
+    static String pluginsDirectory;
+    static bool cachedPluginDirectory = false;
 
-    if (!cachedPluginPath) {
-        cachedPluginPath = true;
+    if (!cachedPluginDirectory) {
+        cachedPluginDirectory = true;
 
         int moduleFileNameLen = GetModuleFileName(0, moduleFileNameStr, _MAX_PATH);
 
@@ -319,13 +319,13 @@ static inline String safariPluginsPath()
         if (!PathRemoveFileSpec(moduleFileNameStr))
             goto exit;
 
-        pluginsPath = String(moduleFileNameStr) + "\\Plugins";
+        pluginsDirectory = String(moduleFileNameStr) + "\\Plugins";
     }
 exit:
-    return pluginsPath;
+    return pluginsDirectory;
 }
 
-static inline void addMacromediaPluginPaths(Vector<String>& paths)
+static inline void addMacromediaPluginDirectories(Vector<String>& directories)
 {
     WCHAR systemDirectoryStr[MAX_PATH];
 
@@ -335,34 +335,34 @@ static inline void addMacromediaPluginPaths(Vector<String>& paths)
     WCHAR macromediaDirectoryStr[MAX_PATH];
 
     PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Flash"));
-    paths.append(macromediaDirectoryStr);
+    directories.append(macromediaDirectoryStr);
 
     PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Shockwave 10"));
-    paths.append(macromediaDirectoryStr);
+    directories.append(macromediaDirectoryStr);
 }
 
-Vector<String> PluginDatabase::defaultPluginPaths()
+Vector<String> PluginDatabase::defaultPluginDirectories()
 {
-    Vector<String> paths;
-    String ourPath = safariPluginsPath();
-
-    if (!ourPath.isNull())
-        paths.append(ourPath);
-    addQuickTimePluginPath(paths);
-    addAdobeAcrobatPluginPath(paths);
-    addMozillaPluginPaths(paths);
-    addWindowsMediaPlayerPluginPath(paths);
-    addMacromediaPluginPaths(paths);
-
-    return paths;
+    Vector<String> directories;
+    String ourDirectory = safariPluginsDirectory();
+
+    if (!ourDirectory.isNull())
+        directories.append(ourDirectory);
+    addQuickTimePluginDirectory(directories);
+    addAdobeAcrobatPluginDirectory(directories);
+    addMozillaPluginDirectories(directories);
+    addWindowsMediaPlayerPluginDirectory(directories);
+    addMacromediaPluginDirectories(directories);
+
+    return directories;
 }
 
-bool PluginDatabase::isPreferredPluginPath(const String& path)
+bool PluginDatabase::isPreferredPluginDirectory(const String& directory)
 {
-    String ourPath = safariPluginsPath();
+    String ourDirectory = safariPluginsDirectory();
 
-    if (!ourPath.isNull() && !path.isNull())
-        return ourPath == path;
+    if (!ourDirectory.isNull() && !directory.isNull())
+        return ourDirectory == directory;
 
     return false;
 }
index 52891ba..6212b00 100644 (file)
@@ -75,8 +75,8 @@ int PluginPackage::compare(const PluginPackage& compareTo) const
         return AallowsMultipleInstances ? -1 : 1;
 
     // Sort plug-ins in a preferred path first.
-    bool AisInPreferredPath = PluginDatabase::isPreferredPluginPath(parentDirectory());
-    bool BisInPreferredPath = PluginDatabase::isPreferredPluginPath(compareTo.parentDirectory());
+    bool AisInPreferredPath = PluginDatabase::isPreferredPluginDirectory(parentDirectory());
+    bool BisInPreferredPath = PluginDatabase::isPreferredPluginDirectory(compareTo.parentDirectory());
     if (AisInPreferredPath != BisInPreferredPath)
         return AisInPreferredPath ? -1 : 1;
 
index 31a32d7..0d10cd1 100644 (file)
@@ -1,3 +1,17 @@
+2008-03-29  Adam Roben  <aroben@apple.com>
+
+        Rename IWebViewPrivate::addAdditionalPluginPath to
+        addAdditionalPluginDirectory
+
+        Reviewed by Mitz Pettel.
+
+        * Interfaces/IWebViewPrivate.idl:
+        * Interfaces/WebKit.idl: Touched to make sure the Interfaces project
+        rebuilds.
+        * WebView.cpp:
+        (WebView::addAdditionalPluginDirectory):
+        * WebView.h:
+
 2008-03-26  Brent Fulgham  <bfulgham@gmail.com>
 
         Reviewed by Adam Roben.
index 0994e6c..83a2763 100644 (file)
@@ -94,7 +94,7 @@ interface IWebViewPrivate : IUnknown
     HRESULT tabKeyCyclesThroughElements([out, retval] BOOL* result);
 
     HRESULT setAllowSiteSpecificHacks([in] BOOL allows);
-    HRESULT addAdditionalPluginPath([in] BSTR path);
+    HRESULT addAdditionalPluginDirectory([in] BSTR directory);
 
     HRESULT loadBackForwardListFromOtherView([in] IWebView* otherView);
 
index 66c307c..43c2922 100644 (file)
@@ -20,7 +20,7 @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 
index a8273a2..5693994 100644 (file)
@@ -4274,10 +4274,10 @@ HRESULT STDMETHODCALLTYPE WebView::setAllowSiteSpecificHacks(
     return S_OK;
 }
 
-HRESULT STDMETHODCALLTYPE WebView::addAdditionalPluginPath
-        /* [in] */ BSTR path)
+HRESULT STDMETHODCALLTYPE WebView::addAdditionalPluginDirectory
+        /* [in] */ BSTR directory)
 {
-    PluginDatabase::installedPlugins()->addExtraPluginPath(String(path, SysStringLen(path)));
+    PluginDatabase::installedPlugins()->addExtraPluginDirectory(String(directory, SysStringLen(directory)));
     return S_OK;
 }
 
index 2cd5855..00f7d2f 100644 (file)
@@ -641,8 +641,8 @@ public:
     virtual HRESULT STDMETHODCALLTYPE setAllowSiteSpecificHacks(
         /* [in] */ BOOL allows);
 
-    virtual HRESULT STDMETHODCALLTYPE addAdditionalPluginPath
-        /* [in] */ BSTR path);    
+    virtual HRESULT STDMETHODCALLTYPE addAdditionalPluginDirectory
+        /* [in] */ BSTR directory);    
 
     virtual HRESULT STDMETHODCALLTYPE loadBackForwardListFromOtherView( 
         /* [in] */ IWebView *otherView);
index 4948c2f..52f0a19 100644 (file)
@@ -1,3 +1,12 @@
+2008-03-29  Adam Roben  <aroben@apple.com>
+
+        Update for rename of an IWebViewPrivate method
+
+        Reviewed by Mitz Pettel.
+
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (createWebViewAndOffscreenWindow):
+
 2008-03-26  Antti Koivisto  <antti@apple.com>
 
         Reviewed by Anders.
index 73be123..1f27816 100644 (file)
@@ -964,7 +964,7 @@ IWebView* createWebViewAndOffscreenWindow(HWND* webViewWindow)
     BSTR pluginPath = SysAllocStringLen(0, exePath().length() + _tcslen(TestPluginDir));
     _tcscpy(pluginPath, exePath().c_str());
     _tcscat(pluginPath, TestPluginDir);
-    failed = FAILED(viewPrivate->addAdditionalPluginPath(pluginPath));
+    failed = FAILED(viewPrivate->addAdditionalPluginDirectory(pluginPath));
     SysFreeString(pluginPath);
     if (failed)
         return 0;