Changeset 64286 in webkit

Timestamp:

Jul 29, 2010 9:40:20 AM (14 years ago)

Author:

Adam Roben

Message:

Always say "directory" when referring to a plugin directory

Fixes <​http://webkit.org/b/43195> WebKit2 often says "plugin path"
when it means "plugin directory"

Reviewed by John Sullivan.

WebKit2:

• UIProcess/API/C/WKContext.cpp:

(_WKContextSetAdditionalPluginDirectory):

• UIProcess/API/C/WKContextPrivate.h:

Renamed from _WKContextSetAdditionalPluginPath.

• UIProcess/Plugins/PluginInfoStore.cpp:

(WebKit::PluginInfoStore::setAdditionalPluginDirectories): Renamed
from setAdditionalPluginPaths.
(WebKit::PluginInfoStore::loadPluginsIfNecessary): Updated for rename.

• UIProcess/Plugins/PluginInfoStore.h: Renamed m_additionalPluginPaths

to m_additionalPluginDirectories.

• UIProcess/WebContext.cpp:

(WebKit::WebContext::setAdditionalPluginDirectory):

• UIProcess/WebContext.h:

Renamed from setAdditionalPluginPath, and updated for PluginInfoStore
rename.

WebKitTools:

• WebKitTestRunner/TestController.cpp:

(WTR::TestController::initialize): Updated for renames.

• WebKitTestRunner/TestController.h: Renamed m_testPluginPath to

m_testPluginDirectory.
(WTR::TestController::testPluginDirectory): Renamed from
testPluginPath.

• WebKitTestRunner/mac/TestControllerMac.mm:

(WTR::TestController::initializeTestPluginDirectory):

• WebKitTestRunner/win/TestControllerWin.cpp:

(WTR::TestController::initializeTestPluginDirectory):
Renamed from initializeTestPluginPath and updated for rename.

Location:

trunk

Files:

• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• WebKit2/UIProcess/API/C/WKContextPrivate.h (modified) (1 diff)
• WebKit2/UIProcess/Plugins/PluginInfoStore.cpp (modified) (2 diffs)
• WebKit2/UIProcess/Plugins/PluginInfoStore.h (modified) (2 diffs)
• WebKit2/UIProcess/WebContext.cpp (modified) (1 diff)
• WebKit2/UIProcess/WebContext.h (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/WebKitTestRunner/TestController.cpp (modified) (2 diffs)
• WebKitTools/WebKitTestRunner/TestController.h (modified) (3 diffs)
• WebKitTools/WebKitTestRunner/mac/TestControllerMac.mm (modified) (1 diff)
• WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-29  Adam Roben  <aroben@apple.com>
+
+        Always say "directory" when referring to a plugin directory
+
+        Fixes <http://webkit.org/b/43195> WebKit2 often says "plugin path"
+        when it means "plugin directory"
+
+        Reviewed by John Sullivan.
+
+        * UIProcess/API/C/WKContext.cpp:
+        (_WKContextSetAdditionalPluginDirectory):
+        * UIProcess/API/C/WKContextPrivate.h:
+        Renamed from _WKContextSetAdditionalPluginPath.
+
+        * UIProcess/Plugins/PluginInfoStore.cpp:
+        (WebKit::PluginInfoStore::setAdditionalPluginDirectories): Renamed
+        from setAdditionalPluginPaths.
+        (WebKit::PluginInfoStore::loadPluginsIfNecessary): Updated for rename.
+
+        * UIProcess/Plugins/PluginInfoStore.h: Renamed m_additionalPluginPaths
+        to m_additionalPluginDirectories.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::setAdditionalPluginDirectory):
+        * UIProcess/WebContext.h:
+        Renamed from setAdditionalPluginPath, and updated for PluginInfoStore
+        rename.
+
 2010-07-29  Adam Roben  <aroben@apple.com>
 

trunk/WebKit2/UIProcess/API/C/WKContext.cpp

@@ -106 +106 @@
 }
 
-void _WKContextSetAdditionalPluginPath(WKContextRef contextRef, WKStringRef pluginPath)
+void _WKContextSetAdditionalPluginDirectory(WKContextRef contextRef, WKStringRef pluginDirectory)
 {
-    toWK(contextRef)->setAdditionalPluginPath(toWK(pluginPath)->string());
+    toWK(contextRef)->setAdditionalPluginDirectory(toWK(pluginDirectory)->string());
 }
 

trunk/WebKit2/UIProcess/API/C/WKContextPrivate.h

@@ -45 +45 @@
 WK_EXPORT WKContextRef WKContextGetSharedThreadContext();
 
-WK_EXPORT void _WKContextSetAdditionalPluginPath(WKContextRef context, WKStringRef pluginPath);
+WK_EXPORT void _WKContextSetAdditionalPluginDirectory(WKContextRef context, WKStringRef pluginDirectory);
 
 WK_EXPORT void _WKContextRegisterURLSchemeAsEmptyDocument(WKContextRef context, WKStringRef urlScheme);

trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp

@@ -41 +41 @@
 }
 
-void PluginInfoStore::setAdditionalPluginPaths(const Vector<WebCore::String>& paths)
+void PluginInfoStore::setAdditionalPluginDirectories(const Vector<WebCore::String>& directories)
 {
-    m_additionalPluginPaths = paths;
+    m_additionalPluginDirectories = directories;
     refresh();
 }
@@ -59 +59 @@
     m_plugins.clear();
 
-    // First, load plug-ins from the additional plug-in paths specified.
-    for (size_t i = 0; i < m_additionalPluginPaths.size(); ++i)
-        loadPluginsInDirectory(m_additionalPluginPaths[i]);
+    // First, load plug-ins from the additional plug-in directories specified.
+    for (size_t i = 0; i < m_additionalPluginDirectories.size(); ++i)
+        loadPluginsInDirectory(m_additionalPluginDirectories[i]);
 
     Vector<String> directories = pluginDirectories();

trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.h

@@ -39 +39 @@
     PluginInfoStore();
 
-    void setAdditionalPluginPaths(const Vector<WebCore::String>& paths);
+    void setAdditionalPluginDirectories(const Vector<WebCore::String>&);
 
     void refresh();
@@ -75 +75 @@
     static bool shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins);
     
-    Vector<WebCore::String> m_additionalPluginPaths;
+    Vector<WebCore::String> m_additionalPluginDirectories;
     Vector<Plugin> m_plugins;
     bool m_pluginListIsUpToDate;

trunk/WebKit2/UIProcess/WebContext.cpp

@@ -219 +219 @@
 }
 
-void WebContext::setAdditionalPluginPath(const WebCore::String& pluginPath)
-{
-    Vector<String> pluginPaths;
-    pluginPaths.append(pluginPath);
-
-    m_pluginInfoStore.setAdditionalPluginPaths(pluginPaths);
+void WebContext::setAdditionalPluginDirectory(const WebCore::String& directory)
+{
+    Vector<String> directories;
+    directories.append(directory);
+
+    m_pluginInfoStore.setAdditionalPluginDirectories(directories);
 }
 

trunk/WebKit2/UIProcess/WebContext.h

@@ -90 +90 @@
     
     void getStatistics(WKContextStatistics* statistics);
-    void setAdditionalPluginPath(const WebCore::String&);
+    void setAdditionalPluginDirectory(const WebCore::String&);
 
     PluginInfoStore* pluginInfoStore() { return &m_pluginInfoStore; }

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-07-29  Adam Roben  <aroben@apple.com>
+
+        Always say "directory" when referring to a plugin directory
+
+        Fixes <http://webkit.org/b/43195> WebKit2 often says "plugin path"
+        when it means "plugin directory"
+
+        Reviewed by John Sullivan.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::initialize): Updated for renames.
+
+        * WebKitTestRunner/TestController.h: Renamed m_testPluginPath to
+        m_testPluginDirectory.
+        (WTR::TestController::testPluginDirectory): Renamed from
+        testPluginPath.
+
+        * WebKitTestRunner/mac/TestControllerMac.mm:
+        (WTR::TestController::initializeTestPluginDirectory):
+        * WebKitTestRunner/win/TestControllerWin.cpp:
+        (WTR::TestController::initializeTestPluginDirectory):
+        Renamed from initializeTestPluginPath and updated for rename.
+
 2010-07-29  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/WebKitTools/WebKitTestRunner/TestController.cpp

@@ -76 +76 @@
 
     initializeInjectedBundlePath();
-    initializeTestPluginPath();
+    initializeTestPluginDirectory();
 
     m_context.adopt(WKContextCreateWithInjectedBundlePath(injectedBundlePath()));
@@ -87 +87 @@
     WKContextSetInjectedBundleClient(m_context.get(), &injectedBundlePathClient);
 
-    _WKContextSetAdditionalPluginPath(m_context.get(), testPluginPath());
+    _WKContextSetAdditionalPluginDirectory(m_context.get(), testPluginDirectory());
     
     m_pageNamespace.adopt(WKPageNamespaceCreate(m_context.get()));

trunk/WebKitTools/WebKitTestRunner/TestController.h

@@ -50 +50 @@
 
     WKStringRef injectedBundlePath() { return m_injectedBundlePath.get(); }
-    WKStringRef testPluginPath() { return m_testPluginPath.get(); }
+    WKStringRef testPluginDirectory() { return m_testPluginDirectory.get(); }
 
     PlatformWebView* mainWebView() { return m_mainWebView; }
@@ -65 +65 @@
     void platformInitialize();
     void initializeInjectedBundlePath();
-    void initializeTestPluginPath();
+    void initializeTestPluginDirectory();
 
     // WKContextInjectedBundleClient
@@ -79 +79 @@
     std::vector<std::string> m_paths;
     WKRetainPtr<WKStringRef> m_injectedBundlePath;
-    WKRetainPtr<WKStringRef> m_testPluginPath;
+    WKRetainPtr<WKStringRef> m_testPluginDirectory;
 
     PlatformWebView* m_mainWebView;

trunk/WebKitTools/WebKitTestRunner/mac/TestControllerMac.mm

@@ -41 +41 @@
 }
 
-void TestController::initializeTestPluginPath()
+void TestController::initializeTestPluginDirectory()
 {
-    m_testPluginPath.adopt(WKStringCreateWithCFString((CFStringRef)[[NSBundle mainBundle] bundlePath]));
+    m_testPluginDirectory.adopt(WKStringCreateWithCFString((CFStringRef)[[NSBundle mainBundle] bundlePath]));
 }
 

trunk/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp

@@ -51 +51 @@
 }
 
-void TestController::initializeTestPluginPath()
+void TestController::initializeTestPluginDirectory()
 {
     CFStringRef exeContainerPath = CFURLCopyFileSystemPath(CFURLCreateCopyDeletingLastPathComponent(0, CFBundleCopyExecutableURL(CFBundleGetMainBundle())), kCFURLWindowsPathStyle);
     CFMutableStringRef bundlePath = CFStringCreateMutableCopy(0, 0, exeContainerPath);
-    m_testPluginPath.adopt(WKStringCreateWithCFString(bundlePath));
+    m_testPluginDirectory.adopt(WKStringCreateWithCFString(bundlePath));
 }