Changeset 64287 in webkit
- Timestamp:
- Jul 29, 2010 9:53:42 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r64286 r64287 1 2010-07-29 Adam Roben <aroben@apple.com> 2 3 Always say "plugins directory" when referring to a directory 4 containing one or more plugins 5 6 Fixes <http://webkit.org/b/43197> WebKit2 often says "plugin 7 directory" when it means "plugins directory" 8 9 Reviewed by John Sullivan. 10 11 * UIProcess/API/C/WKContext.cpp: 12 (_WKContextSetAdditionalPluginsDirectory): 13 * UIProcess/API/C/WKContextPrivate.h: 14 Renamed from _WKContextSetAdditionalPluginDirectory. 15 16 * UIProcess/Plugins/PluginInfoStore.cpp: 17 (WebKit::PluginInfoStore::setAdditionalPluginsDirectories): Renamed 18 from setAdditionalPluginDirectories. 19 (WebKit::PluginInfoStore::loadPluginsIfNecessary): Updated for rename. 20 21 * UIProcess/Plugins/PluginInfoStore.h: Renamed 22 m_additionalPluginDirectories to m_additionalPluginsDirectories. 23 24 * UIProcess/Plugins/mac/PluginInfoStoreMac.mm: 25 (WebKit::PluginInfoStore::pluginsDirectories): 26 * UIProcess/Plugins/qt/PluginInfoStoreQt.cpp: 27 (WebKit::PluginInfoStore::pluginsDirectories): 28 * UIProcess/Plugins/win/PluginInfoStoreWin.cpp: 29 (WebKit::PluginInfoStore::pluginsDirectories): 30 Renamed from pluginDirectories. 31 32 * UIProcess/WebContext.cpp: 33 (WebKit::WebContext::setAdditionalPluginsDirectory): 34 * UIProcess/WebContext.h: 35 Renamed from setAdditionalPluginDirectory. 36 1 37 2010-07-29 Adam Roben <aroben@apple.com> 2 38 -
trunk/WebKit2/UIProcess/API/C/WKContext.cpp
r64286 r64287 106 106 } 107 107 108 void _WKContextSetAdditionalPlugin Directory(WKContextRef contextRef, WKStringRef pluginDirectory)108 void _WKContextSetAdditionalPluginsDirectory(WKContextRef contextRef, WKStringRef pluginsDirectory) 109 109 { 110 toWK(contextRef)->setAdditionalPlugin Directory(toWK(pluginDirectory)->string());110 toWK(contextRef)->setAdditionalPluginsDirectory(toWK(pluginsDirectory)->string()); 111 111 } 112 112 -
trunk/WebKit2/UIProcess/API/C/WKContextPrivate.h
r64286 r64287 45 45 WK_EXPORT WKContextRef WKContextGetSharedThreadContext(); 46 46 47 WK_EXPORT void _WKContextSetAdditionalPlugin Directory(WKContextRef context, WKStringRef pluginDirectory);47 WK_EXPORT void _WKContextSetAdditionalPluginsDirectory(WKContextRef context, WKStringRef pluginsDirectory); 48 48 49 49 WK_EXPORT void _WKContextRegisterURLSchemeAsEmptyDocument(WKContextRef context, WKStringRef urlScheme); -
trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp
r64286 r64287 41 41 } 42 42 43 void PluginInfoStore::setAdditionalPlugin Directories(const Vector<WebCore::String>& directories)43 void PluginInfoStore::setAdditionalPluginsDirectories(const Vector<WebCore::String>& directories) 44 44 { 45 m_additionalPlugin Directories = directories;45 m_additionalPluginsDirectories = directories; 46 46 refresh(); 47 47 } … … 59 59 m_plugins.clear(); 60 60 61 // First, load plug-ins from the additional plug-in directories specified.62 for (size_t i = 0; i < m_additionalPlugin Directories.size(); ++i)63 loadPluginsInDirectory(m_additionalPlugin Directories[i]);61 // First, load plug-ins from the additional plug-ins directories specified. 62 for (size_t i = 0; i < m_additionalPluginsDirectories.size(); ++i) 63 loadPluginsInDirectory(m_additionalPluginsDirectories[i]); 64 64 65 Vector<String> directories = plugin Directories();65 Vector<String> directories = pluginsDirectories(); 66 66 for (size_t i = 0; i < directories.size(); ++i) 67 67 loadPluginsInDirectory(directories[i]); -
trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.h
r64286 r64287 39 39 PluginInfoStore(); 40 40 41 void setAdditionalPlugin Directories(const Vector<WebCore::String>&);41 void setAdditionalPluginsDirectories(const Vector<WebCore::String>&); 42 42 43 43 void refresh(); … … 70 70 71 71 // Platform specific member functions. 72 static Vector<WebCore::String> plugin Directories();72 static Vector<WebCore::String> pluginsDirectories(); 73 73 static Vector<WebCore::String> pluginPathsInDirectory(const WebCore::String& directory); 74 74 static bool getPluginInfo(const WebCore::String& pluginPath, Plugin& plugin); 75 75 static bool shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins); 76 76 77 Vector<WebCore::String> m_additionalPlugin Directories;77 Vector<WebCore::String> m_additionalPluginsDirectories; 78 78 Vector<Plugin> m_plugins; 79 79 bool m_pluginListIsUpToDate; -
trunk/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
r64278 r64287 34 34 namespace WebKit { 35 35 36 Vector<String> PluginInfoStore::plugin Directories()37 { 38 Vector<String> plugin Directories;39 40 plugin Directories.append([NSHomeDirectory() stringByAppendingPathComponent:@"Library/Internet Plug-Ins"]);41 plugin Directories.append("/Library/Internet Plug-Ins");42 43 return plugin Directories;36 Vector<String> PluginInfoStore::pluginsDirectories() 37 { 38 Vector<String> pluginsDirectories; 39 40 pluginsDirectories.append([NSHomeDirectory() stringByAppendingPathComponent:@"Library/Internet Plug-Ins"]); 41 pluginsDirectories.append("/Library/Internet Plug-Ins"); 42 43 return pluginsDirectories; 44 44 } 45 45 -
trunk/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp
r64278 r64287 32 32 namespace WebKit { 33 33 34 Vector<String> PluginInfoStore::plugin Directories()34 Vector<String> PluginInfoStore::pluginsDirectories() 35 35 { 36 36 notImplemented(); -
trunk/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp
r64278 r64287 32 32 namespace WebKit { 33 33 34 Vector<String> PluginInfoStore::plugin Directories()34 Vector<String> PluginInfoStore::pluginsDirectories() 35 35 { 36 36 notImplemented(); -
trunk/WebKit2/UIProcess/WebContext.cpp
r64286 r64287 219 219 } 220 220 221 void WebContext::setAdditionalPlugin Directory(const WebCore::String& directory)221 void WebContext::setAdditionalPluginsDirectory(const WebCore::String& directory) 222 222 { 223 223 Vector<String> directories; 224 224 directories.append(directory); 225 225 226 m_pluginInfoStore.setAdditionalPlugin Directories(directories);226 m_pluginInfoStore.setAdditionalPluginsDirectories(directories); 227 227 } 228 228 -
trunk/WebKit2/UIProcess/WebContext.h
r64286 r64287 90 90 91 91 void getStatistics(WKContextStatistics* statistics); 92 void setAdditionalPlugin Directory(const WebCore::String&);92 void setAdditionalPluginsDirectory(const WebCore::String&); 93 93 94 94 PluginInfoStore* pluginInfoStore() { return &m_pluginInfoStore; } -
trunk/WebKitTools/ChangeLog
r64286 r64287 1 2010-07-29 Adam Roben <aroben@apple.com> 2 3 Always say "plugins directory" when referring to a directory 4 containing one or more plugins 5 6 Fixes <http://webkit.org/b/43197> WebKit2 often says "plugin 7 directory" when it means "plugins directory" 8 9 Reviewed by John Sullivan. 10 11 * WebKitTestRunner/TestController.cpp: 12 (WTR::TestController::initialize): Updated for rename. 13 1 14 2010-07-29 Adam Roben <aroben@apple.com> 2 15 -
trunk/WebKitTools/WebKitTestRunner/TestController.cpp
r64286 r64287 87 87 WKContextSetInjectedBundleClient(m_context.get(), &injectedBundlePathClient); 88 88 89 _WKContextSetAdditionalPlugin Directory(m_context.get(), testPluginDirectory());89 _WKContextSetAdditionalPluginsDirectory(m_context.get(), testPluginDirectory()); 90 90 91 91 m_pageNamespace.adopt(WKPageNamespaceCreate(m_context.get()));
Note: See TracChangeset
for help on using the changeset viewer.