Changeset 64286 in webkit
- Timestamp:
- Jul 29, 2010 9:40:20 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r64278 r64286 1 2010-07-29 Adam Roben <aroben@apple.com> 2 3 Always say "directory" when referring to a plugin directory 4 5 Fixes <http://webkit.org/b/43195> WebKit2 often says "plugin path" 6 when it means "plugin directory" 7 8 Reviewed by John Sullivan. 9 10 * UIProcess/API/C/WKContext.cpp: 11 (_WKContextSetAdditionalPluginDirectory): 12 * UIProcess/API/C/WKContextPrivate.h: 13 Renamed from _WKContextSetAdditionalPluginPath. 14 15 * UIProcess/Plugins/PluginInfoStore.cpp: 16 (WebKit::PluginInfoStore::setAdditionalPluginDirectories): Renamed 17 from setAdditionalPluginPaths. 18 (WebKit::PluginInfoStore::loadPluginsIfNecessary): Updated for rename. 19 20 * UIProcess/Plugins/PluginInfoStore.h: Renamed m_additionalPluginPaths 21 to m_additionalPluginDirectories. 22 23 * UIProcess/WebContext.cpp: 24 (WebKit::WebContext::setAdditionalPluginDirectory): 25 * UIProcess/WebContext.h: 26 Renamed from setAdditionalPluginPath, and updated for PluginInfoStore 27 rename. 28 1 29 2010-07-29 Adam Roben <aroben@apple.com> 2 30 -
trunk/WebKit2/UIProcess/API/C/WKContext.cpp
r64253 r64286 106 106 } 107 107 108 void _WKContextSetAdditionalPlugin Path(WKContextRef contextRef, WKStringRef pluginPath)108 void _WKContextSetAdditionalPluginDirectory(WKContextRef contextRef, WKStringRef pluginDirectory) 109 109 { 110 toWK(contextRef)->setAdditionalPlugin Path(toWK(pluginPath)->string());110 toWK(contextRef)->setAdditionalPluginDirectory(toWK(pluginDirectory)->string()); 111 111 } 112 112 -
trunk/WebKit2/UIProcess/API/C/WKContextPrivate.h
r64070 r64286 45 45 WK_EXPORT WKContextRef WKContextGetSharedThreadContext(); 46 46 47 WK_EXPORT void _WKContextSetAdditionalPlugin Path(WKContextRef context, WKStringRef pluginPath);47 WK_EXPORT void _WKContextSetAdditionalPluginDirectory(WKContextRef context, WKStringRef pluginDirectory); 48 48 49 49 WK_EXPORT void _WKContextRegisterURLSchemeAsEmptyDocument(WKContextRef context, WKStringRef urlScheme); -
trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
r64278 r64286 41 41 } 42 42 43 void PluginInfoStore::setAdditionalPlugin Paths(const Vector<WebCore::String>& paths)43 void PluginInfoStore::setAdditionalPluginDirectories(const Vector<WebCore::String>& directories) 44 44 { 45 m_additionalPlugin Paths = paths;45 m_additionalPluginDirectories = directories; 46 46 refresh(); 47 47 } … … 59 59 m_plugins.clear(); 60 60 61 // First, load plug-ins from the additional plug-in paths specified.62 for (size_t i = 0; i < m_additionalPlugin Paths.size(); ++i)63 loadPluginsInDirectory(m_additionalPlugin Paths[i]);61 // First, load plug-ins from the additional plug-in directories specified. 62 for (size_t i = 0; i < m_additionalPluginDirectories.size(); ++i) 63 loadPluginsInDirectory(m_additionalPluginDirectories[i]); 64 64 65 65 Vector<String> directories = pluginDirectories(); -
trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.h
r64278 r64286 39 39 PluginInfoStore(); 40 40 41 void setAdditionalPlugin Paths(const Vector<WebCore::String>& paths);41 void setAdditionalPluginDirectories(const Vector<WebCore::String>&); 42 42 43 43 void refresh(); … … 75 75 static bool shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins); 76 76 77 Vector<WebCore::String> m_additionalPlugin Paths;77 Vector<WebCore::String> m_additionalPluginDirectories; 78 78 Vector<Plugin> m_plugins; 79 79 bool m_pluginListIsUpToDate; -
trunk/WebKit2/UIProcess/WebContext.cpp
r64247 r64286 219 219 } 220 220 221 void WebContext::setAdditionalPlugin Path(const WebCore::String& pluginPath)222 { 223 Vector<String> pluginPaths;224 pluginPaths.append(pluginPath);225 226 m_pluginInfoStore.setAdditionalPlugin Paths(pluginPaths);221 void WebContext::setAdditionalPluginDirectory(const WebCore::String& directory) 222 { 223 Vector<String> directories; 224 directories.append(directory); 225 226 m_pluginInfoStore.setAdditionalPluginDirectories(directories); 227 227 } 228 228 -
trunk/WebKit2/UIProcess/WebContext.h
r64253 r64286 90 90 91 91 void getStatistics(WKContextStatistics* statistics); 92 void setAdditionalPlugin Path(const WebCore::String&);92 void setAdditionalPluginDirectory(const WebCore::String&); 93 93 94 94 PluginInfoStore* pluginInfoStore() { return &m_pluginInfoStore; } -
trunk/WebKitTools/ChangeLog
r64285 r64286 1 2010-07-29 Adam Roben <aroben@apple.com> 2 3 Always say "directory" when referring to a plugin directory 4 5 Fixes <http://webkit.org/b/43195> WebKit2 often says "plugin path" 6 when it means "plugin directory" 7 8 Reviewed by John Sullivan. 9 10 * WebKitTestRunner/TestController.cpp: 11 (WTR::TestController::initialize): Updated for renames. 12 13 * WebKitTestRunner/TestController.h: Renamed m_testPluginPath to 14 m_testPluginDirectory. 15 (WTR::TestController::testPluginDirectory): Renamed from 16 testPluginPath. 17 18 * WebKitTestRunner/mac/TestControllerMac.mm: 19 (WTR::TestController::initializeTestPluginDirectory): 20 * WebKitTestRunner/win/TestControllerWin.cpp: 21 (WTR::TestController::initializeTestPluginDirectory): 22 Renamed from initializeTestPluginPath and updated for rename. 23 1 24 2010-07-29 Csaba Osztrogonác <ossy@webkit.org> 2 25 -
trunk/WebKitTools/WebKitTestRunner/TestController.cpp
r64029 r64286 76 76 77 77 initializeInjectedBundlePath(); 78 initializeTestPlugin Path();78 initializeTestPluginDirectory(); 79 79 80 80 m_context.adopt(WKContextCreateWithInjectedBundlePath(injectedBundlePath())); … … 87 87 WKContextSetInjectedBundleClient(m_context.get(), &injectedBundlePathClient); 88 88 89 _WKContextSetAdditionalPlugin Path(m_context.get(), testPluginPath());89 _WKContextSetAdditionalPluginDirectory(m_context.get(), testPluginDirectory()); 90 90 91 91 m_pageNamespace.adopt(WKPageNamespaceCreate(m_context.get())); -
trunk/WebKitTools/WebKitTestRunner/TestController.h
r64029 r64286 50 50 51 51 WKStringRef injectedBundlePath() { return m_injectedBundlePath.get(); } 52 WKStringRef testPlugin Path() { return m_testPluginPath.get(); }52 WKStringRef testPluginDirectory() { return m_testPluginDirectory.get(); } 53 53 54 54 PlatformWebView* mainWebView() { return m_mainWebView; } … … 65 65 void platformInitialize(); 66 66 void initializeInjectedBundlePath(); 67 void initializeTestPlugin Path();67 void initializeTestPluginDirectory(); 68 68 69 69 // WKContextInjectedBundleClient … … 79 79 std::vector<std::string> m_paths; 80 80 WKRetainPtr<WKStringRef> m_injectedBundlePath; 81 WKRetainPtr<WKStringRef> m_testPlugin Path;81 WKRetainPtr<WKStringRef> m_testPluginDirectory; 82 82 83 83 PlatformWebView* m_mainWebView; -
trunk/WebKitTools/WebKitTestRunner/mac/TestControllerMac.mm
r63700 r64286 41 41 } 42 42 43 void TestController::initializeTestPlugin Path()43 void TestController::initializeTestPluginDirectory() 44 44 { 45 m_testPlugin Path.adopt(WKStringCreateWithCFString((CFStringRef)[[NSBundle mainBundle] bundlePath]));45 m_testPluginDirectory.adopt(WKStringCreateWithCFString((CFStringRef)[[NSBundle mainBundle] bundlePath])); 46 46 } 47 47 -
trunk/WebKitTools/WebKitTestRunner/win/TestControllerWin.cpp
r64129 r64286 51 51 } 52 52 53 void TestController::initializeTestPlugin Path()53 void TestController::initializeTestPluginDirectory() 54 54 { 55 55 CFStringRef exeContainerPath = CFURLCopyFileSystemPath(CFURLCreateCopyDeletingLastPathComponent(0, CFBundleCopyExecutableURL(CFBundleGetMainBundle())), kCFURLWindowsPathStyle); 56 56 CFMutableStringRef bundlePath = CFStringCreateMutableCopy(0, 0, exeContainerPath); 57 m_testPlugin Path.adopt(WKStringCreateWithCFString(bundlePath));57 m_testPluginDirectory.adopt(WKStringCreateWithCFString(bundlePath)); 58 58 } 59 59
Note: See TracChangeset
for help on using the changeset viewer.