Changeset 64287 in webkit


Ignore:
Timestamp:
Jul 29, 2010 9:53:42 AM (14 years ago)
Author:
Adam Roben
Message:

Always say "plugins directory" when referring to a directory containing one or more plugins

Fixes <http://webkit.org/b/43197> WebKit2 often says "plugin
directory" when it means "plugins directory"

Reviewed by John Sullivan.

WebKit2:

  • UIProcess/API/C/WKContext.cpp:

(_WKContextSetAdditionalPluginsDirectory):

  • UIProcess/API/C/WKContextPrivate.h:

Renamed from _WKContextSetAdditionalPluginDirectory.

  • UIProcess/Plugins/PluginInfoStore.cpp:

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

  • UIProcess/Plugins/PluginInfoStore.h: Renamed

m_additionalPluginDirectories to m_additionalPluginsDirectories.

  • UIProcess/Plugins/mac/PluginInfoStoreMac.mm:

(WebKit::PluginInfoStore::pluginsDirectories):

  • UIProcess/Plugins/qt/PluginInfoStoreQt.cpp:

(WebKit::PluginInfoStore::pluginsDirectories):

  • UIProcess/Plugins/win/PluginInfoStoreWin.cpp:

(WebKit::PluginInfoStore::pluginsDirectories):
Renamed from pluginDirectories.

  • UIProcess/WebContext.cpp:

(WebKit::WebContext::setAdditionalPluginsDirectory):

  • UIProcess/WebContext.h:

Renamed from setAdditionalPluginDirectory.

WebKitTools:

  • WebKitTestRunner/TestController.cpp:

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

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit2/ChangeLog

    r64286 r64287  
     12010-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
    1372010-07-29  Adam Roben  <aroben@apple.com>
    238
  • trunk/WebKit2/UIProcess/API/C/WKContext.cpp

    r64286 r64287  
    106106}
    107107
    108 void _WKContextSetAdditionalPluginDirectory(WKContextRef contextRef, WKStringRef pluginDirectory)
     108void _WKContextSetAdditionalPluginsDirectory(WKContextRef contextRef, WKStringRef pluginsDirectory)
    109109{
    110     toWK(contextRef)->setAdditionalPluginDirectory(toWK(pluginDirectory)->string());
     110    toWK(contextRef)->setAdditionalPluginsDirectory(toWK(pluginsDirectory)->string());
    111111}
    112112
  • trunk/WebKit2/UIProcess/API/C/WKContextPrivate.h

    r64286 r64287  
    4545WK_EXPORT WKContextRef WKContextGetSharedThreadContext();
    4646
    47 WK_EXPORT void _WKContextSetAdditionalPluginDirectory(WKContextRef context, WKStringRef pluginDirectory);
     47WK_EXPORT void _WKContextSetAdditionalPluginsDirectory(WKContextRef context, WKStringRef pluginsDirectory);
    4848
    4949WK_EXPORT void _WKContextRegisterURLSchemeAsEmptyDocument(WKContextRef context, WKStringRef urlScheme);
  • trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.cpp

    r64286 r64287  
    4141}
    4242
    43 void PluginInfoStore::setAdditionalPluginDirectories(const Vector<WebCore::String>& directories)
     43void PluginInfoStore::setAdditionalPluginsDirectories(const Vector<WebCore::String>& directories)
    4444{
    45     m_additionalPluginDirectories = directories;
     45    m_additionalPluginsDirectories = directories;
    4646    refresh();
    4747}
     
    5959    m_plugins.clear();
    6060
    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]);
     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]);
    6464
    65     Vector<String> directories = pluginDirectories();
     65    Vector<String> directories = pluginsDirectories();
    6666    for (size_t i = 0; i < directories.size(); ++i)
    6767        loadPluginsInDirectory(directories[i]);
  • trunk/WebKit2/UIProcess/Plugins/PluginInfoStore.h

    r64286 r64287  
    3939    PluginInfoStore();
    4040
    41     void setAdditionalPluginDirectories(const Vector<WebCore::String>&);
     41    void setAdditionalPluginsDirectories(const Vector<WebCore::String>&);
    4242
    4343    void refresh();
     
    7070   
    7171    // Platform specific member functions.
    72     static Vector<WebCore::String> pluginDirectories();
     72    static Vector<WebCore::String> pluginsDirectories();
    7373    static Vector<WebCore::String> pluginPathsInDirectory(const WebCore::String& directory);
    7474    static bool getPluginInfo(const WebCore::String& pluginPath, Plugin& plugin);
    7575    static bool shouldUsePlugin(const Plugin& plugin, const Vector<Plugin>& loadedPlugins);
    7676   
    77     Vector<WebCore::String> m_additionalPluginDirectories;
     77    Vector<WebCore::String> m_additionalPluginsDirectories;
    7878    Vector<Plugin> m_plugins;
    7979    bool m_pluginListIsUpToDate;
  • trunk/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm

    r64278 r64287  
    3434namespace WebKit {
    3535
    36 Vector<String> PluginInfoStore::pluginDirectories()
    37 {
    38     Vector<String> pluginDirectories;
    39 
    40     pluginDirectories.append([NSHomeDirectory() stringByAppendingPathComponent:@"Library/Internet Plug-Ins"]);
    41     pluginDirectories.append("/Library/Internet Plug-Ins");
    42    
    43     return pluginDirectories;
     36Vector<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;
    4444}
    4545
  • trunk/WebKit2/UIProcess/Plugins/qt/PluginInfoStoreQt.cpp

    r64278 r64287  
    3232namespace WebKit {
    3333
    34 Vector<String> PluginInfoStore::pluginDirectories()
     34Vector<String> PluginInfoStore::pluginsDirectories()
    3535{
    3636    notImplemented();
  • trunk/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp

    r64278 r64287  
    3232namespace WebKit {
    3333
    34 Vector<String> PluginInfoStore::pluginDirectories()
     34Vector<String> PluginInfoStore::pluginsDirectories()
    3535{
    3636    notImplemented();
  • trunk/WebKit2/UIProcess/WebContext.cpp

    r64286 r64287  
    219219}
    220220
    221 void WebContext::setAdditionalPluginDirectory(const WebCore::String& directory)
     221void WebContext::setAdditionalPluginsDirectory(const WebCore::String& directory)
    222222{
    223223    Vector<String> directories;
    224224    directories.append(directory);
    225225
    226     m_pluginInfoStore.setAdditionalPluginDirectories(directories);
     226    m_pluginInfoStore.setAdditionalPluginsDirectories(directories);
    227227}
    228228
  • trunk/WebKit2/UIProcess/WebContext.h

    r64286 r64287  
    9090   
    9191    void getStatistics(WKContextStatistics* statistics);
    92     void setAdditionalPluginDirectory(const WebCore::String&);
     92    void setAdditionalPluginsDirectory(const WebCore::String&);
    9393
    9494    PluginInfoStore* pluginInfoStore() { return &m_pluginInfoStore; }
  • trunk/WebKitTools/ChangeLog

    r64286 r64287  
     12010-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
    1142010-07-29  Adam Roben  <aroben@apple.com>
    215
  • trunk/WebKitTools/WebKitTestRunner/TestController.cpp

    r64286 r64287  
    8787    WKContextSetInjectedBundleClient(m_context.get(), &injectedBundlePathClient);
    8888
    89     _WKContextSetAdditionalPluginDirectory(m_context.get(), testPluginDirectory());
     89    _WKContextSetAdditionalPluginsDirectory(m_context.get(), testPluginDirectory());
    9090   
    9191    m_pageNamespace.adopt(WKPageNamespaceCreate(m_context.get()));
Note: See TracChangeset for help on using the changeset viewer.