[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
aroben at apple.com
aroben at apple.com
Wed Dec 22 11:34:02 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f94f82b20eb01384518b830b88c08c9a64141817
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 29 16:40:20 2010 +0000
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.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64286 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ea3d38a..103a2b4 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,33 @@
2010-07-29 Adam Roben <aroben at 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 at apple.com>
+
Remove PluginInfoStore::mimeTypeFromExtension
WebCore::MIMETypeRegistry already provides a cross-platform interface
diff --git a/WebKit2/UIProcess/API/C/WKContext.cpp b/WebKit2/UIProcess/API/C/WKContext.cpp
index 7d63781..3921ca5 100644
--- a/WebKit2/UIProcess/API/C/WKContext.cpp
+++ b/WebKit2/UIProcess/API/C/WKContext.cpp
@@ -105,9 +105,9 @@ void WKContextRelease(WKContextRef contextRef)
toWK(contextRef)->deref();
}
-void _WKContextSetAdditionalPluginPath(WKContextRef contextRef, WKStringRef pluginPath)
+void _WKContextSetAdditionalPluginDirectory(WKContextRef contextRef, WKStringRef pluginDirectory)
{
- toWK(contextRef)->setAdditionalPluginPath(toWK(pluginPath)->string());
+ toWK(contextRef)->setAdditionalPluginDirectory(toWK(pluginDirectory)->string());
}
void _WKContextRegisterURLSchemeAsEmptyDocument(WKContextRef contextRef, WKStringRef urlScheme)
diff --git a/WebKit2/UIProcess/API/C/WKContextPrivate.h b/WebKit2/UIProcess/API/C/WKContextPrivate.h
index e06434d..0b86e09 100644
--- a/WebKit2/UIProcess/API/C/WKContextPrivate.h
+++ b/WebKit2/UIProcess/API/C/WKContextPrivate.h
@@ -44,7 +44,7 @@ WK_EXPORT void WKContextGetStatistics(WKContextRef context, WKContextStatistics*
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);
diff --git a/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp b/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
index 782b023..566cd1e 100644
--- a/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
+++ b/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
@@ -40,9 +40,9 @@ PluginInfoStore::PluginInfoStore()
{
}
-void PluginInfoStore::setAdditionalPluginPaths(const Vector<WebCore::String>& paths)
+void PluginInfoStore::setAdditionalPluginDirectories(const Vector<WebCore::String>& directories)
{
- m_additionalPluginPaths = paths;
+ m_additionalPluginDirectories = directories;
refresh();
}
@@ -58,9 +58,9 @@ void PluginInfoStore::loadPluginsIfNecessary()
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();
for (size_t i = 0; i < directories.size(); ++i)
diff --git a/WebKit2/UIProcess/Plugins/PluginInfoStore.h b/WebKit2/UIProcess/Plugins/PluginInfoStore.h
index bd56b19..25dbe28 100644
--- a/WebKit2/UIProcess/Plugins/PluginInfoStore.h
+++ b/WebKit2/UIProcess/Plugins/PluginInfoStore.h
@@ -38,7 +38,7 @@ class PluginInfoStore {
public:
PluginInfoStore();
- void setAdditionalPluginPaths(const Vector<WebCore::String>& paths);
+ void setAdditionalPluginDirectories(const Vector<WebCore::String>&);
void refresh();
void getPlugins(Vector<WebCore::PluginInfo>& plugins);
@@ -74,7 +74,7 @@ private:
static bool getPluginInfo(const WebCore::String& pluginPath, Plugin& plugin);
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;
};
diff --git a/WebKit2/UIProcess/WebContext.cpp b/WebKit2/UIProcess/WebContext.cpp
index ed36f5b..16c7a1f 100644
--- a/WebKit2/UIProcess/WebContext.cpp
+++ b/WebKit2/UIProcess/WebContext.cpp
@@ -218,12 +218,12 @@ void WebContext::getStatistics(WKContextStatistics* statistics)
(*it)->getStatistics(statistics);
}
-void WebContext::setAdditionalPluginPath(const WebCore::String& pluginPath)
+void WebContext::setAdditionalPluginDirectory(const WebCore::String& directory)
{
- Vector<String> pluginPaths;
- pluginPaths.append(pluginPath);
+ Vector<String> directories;
+ directories.append(directory);
- m_pluginInfoStore.setAdditionalPluginPaths(pluginPaths);
+ m_pluginInfoStore.setAdditionalPluginDirectories(directories);
}
void WebContext::registerURLSchemeAsEmptyDocument(const String& urlScheme)
diff --git a/WebKit2/UIProcess/WebContext.h b/WebKit2/UIProcess/WebContext.h
index 19080e3..c9089f5 100644
--- a/WebKit2/UIProcess/WebContext.h
+++ b/WebKit2/UIProcess/WebContext.h
@@ -89,7 +89,7 @@ public:
void populateVisitedLinks();
void getStatistics(WKContextStatistics* statistics);
- void setAdditionalPluginPath(const WebCore::String&);
+ void setAdditionalPluginDirectory(const WebCore::String&);
PluginInfoStore* pluginInfoStore() { return &m_pluginInfoStore; }
WebCore::String applicationCacheDirectory();
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7047dc1..2ec6718 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,26 @@
+2010-07-29 Adam Roben <aroben at 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 at webkit.org>
Reviewed by Antonio Gomes.
diff --git a/WebKitTools/WebKitTestRunner/TestController.cpp b/WebKitTools/WebKitTestRunner/TestController.cpp
index 4f8cd6b..ce1b474 100644
--- a/WebKitTools/WebKitTestRunner/TestController.cpp
+++ b/WebKitTools/WebKitTestRunner/TestController.cpp
@@ -75,7 +75,7 @@ void TestController::initialize(int argc, const char* argv[])
m_printSeparators = m_paths.size() > 1;
initializeInjectedBundlePath();
- initializeTestPluginPath();
+ initializeTestPluginDirectory();
m_context.adopt(WKContextCreateWithInjectedBundlePath(injectedBundlePath()));
@@ -86,7 +86,7 @@ void TestController::initialize(int argc, const char* argv[])
};
WKContextSetInjectedBundleClient(m_context.get(), &injectedBundlePathClient);
- _WKContextSetAdditionalPluginPath(m_context.get(), testPluginPath());
+ _WKContextSetAdditionalPluginDirectory(m_context.get(), testPluginDirectory());
m_pageNamespace.adopt(WKPageNamespaceCreate(m_context.get()));
m_mainWebView = new PlatformWebView(m_pageNamespace.get());
diff --git a/WebKitTools/WebKitTestRunner/TestController.h b/WebKitTools/WebKitTestRunner/TestController.h
index bd073bf..ea09fae 100644
--- a/WebKitTools/WebKitTestRunner/TestController.h
+++ b/WebKitTools/WebKitTestRunner/TestController.h
@@ -49,7 +49,7 @@ public:
bool verbose() const { return m_verbose; }
WKStringRef injectedBundlePath() { return m_injectedBundlePath.get(); }
- WKStringRef testPluginPath() { return m_testPluginPath.get(); }
+ WKStringRef testPluginDirectory() { return m_testPluginDirectory.get(); }
PlatformWebView* mainWebView() { return m_mainWebView; }
WKPageNamespaceRef pageNamespace() { return m_pageNamespace.get(); }
@@ -64,7 +64,7 @@ private:
void platformInitialize();
void initializeInjectedBundlePath();
- void initializeTestPluginPath();
+ void initializeTestPluginDirectory();
// WKContextInjectedBundleClient
static void _didReceiveMessageFromInjectedBundle(WKContextRef context, WKStringRef message, const void*);
@@ -78,7 +78,7 @@ private:
bool m_usingServerMode;
std::vector<std::string> m_paths;
WKRetainPtr<WKStringRef> m_injectedBundlePath;
- WKRetainPtr<WKStringRef> m_testPluginPath;
+ WKRetainPtr<WKStringRef> m_testPluginDirectory;
PlatformWebView* m_mainWebView;
WKRetainPtr<WKContextRef> m_context;
diff --git a/WebKitTools/WebKitTestRunner/mac/TestControllerMac.mm b/WebKitTools/WebKitTestRunner/mac/TestControllerMac.mm
index ae4cc2f..1a71b5d 100644
--- a/WebKitTools/WebKitTestRunner/mac/TestControllerMac.mm
+++ b/WebKitTools/WebKitTestRunner/mac/TestControllerMac.mm
@@ -40,9 +40,9 @@ void TestController::initializeInjectedBundlePath()
m_injectedBundlePath.adopt(WKStringCreateWithCFString((CFStringRef)nsBundlePath));
}
-void TestController::initializeTestPluginPath()
+void TestController::initializeTestPluginDirectory()
{
- m_testPluginPath.adopt(WKStringCreateWithCFString((CFStringRef)[[NSBundle mainBundle] bundlePath]));
+ m_testPluginDirectory.adopt(WKStringCreateWithCFString((CFStringRef)[[NSBundle mainBundle] bundlePath]));
}
} // namespace WTR
diff --git a/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp b/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
index 987481a..9bec373 100644
--- a/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
+++ b/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
@@ -50,11 +50,11 @@ void TestController::initializeInjectedBundlePath()
m_injectedBundlePath.adopt(WKStringCreateWithCFString(bundlePath));
}
-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));
}
} // namespace WTR
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list