Changeset 31462 in webkit


Ignore:
Timestamp:
Mar 31, 2008 9:54:22 AM (16 years ago)
Author:
Adam Roben
Message:

Rename PluginDatabase's "PluginPaths" to "PluginDirectories"

WebCore:

Rename PluginDatabase's "PluginPaths" to "PluginDirectories"

The code expects these paths to all be directories, so it seems good
to refer to them as such.

This patch just changes "Paths" to "Directories" and "Path" to
"Directory".

Reviewed by Mitz Pettel.

  • platform/qt/TemporaryLinkStubs.cpp:
  • platform/wx/TemporaryLinkStubs.cpp:
  • plugins/PluginDatabase.cpp: (WebCore::PluginDatabase::installedPlugins): (WebCore::PluginDatabase::refresh):
  • plugins/PluginDatabase.h: (WebCore::PluginDatabase::setPluginDirectories):
  • plugins/gtk/PluginDatabaseGtk.cpp: (WebCore::PluginDatabase::getPluginsInDirectories):
  • plugins/win/PluginDatabaseWin.cpp: (WebCore::PluginDatabase::getPluginsInDirectories): (WebCore::safariPluginsDirectory): (WebCore::PluginDatabase::defaultPluginDirectories): (WebCore::PluginDatabase::isPreferredPluginDirectory):
  • plugins/win/PluginPackageWin.cpp: (WebCore::PluginPackage::compare):

WebKit/win:

Rename IWebViewPrivate::addAdditionalPluginPath to
addAdditionalPluginDirectory

Reviewed by Mitz Pettel.

  • Interfaces/IWebViewPrivate.idl:
  • Interfaces/WebKit.idl: Touched to make sure the Interfaces project rebuilds.
  • WebView.cpp: (WebView::addAdditionalPluginDirectory):
  • WebView.h:

WebKitTools:

Update for rename of an IWebViewPrivate method

Reviewed by Mitz Pettel.

  • DumpRenderTree/win/DumpRenderTree.cpp: (createWebViewAndOffscreenWindow):
Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r31461 r31462  
     12008-03-29  Adam Roben  <aroben@apple.com>
     2
     3        Rename PluginDatabase's "PluginPaths" to "PluginDirectories"
     4
     5        The code expects these paths to all be directories, so it seems good
     6        to refer to them as such.
     7
     8        This patch just changes "Paths" to "Directories" and "Path" to
     9        "Directory".
     10
     11        Reviewed by Mitz Pettel.
     12
     13        * platform/qt/TemporaryLinkStubs.cpp:
     14        * platform/wx/TemporaryLinkStubs.cpp:
     15        * plugins/PluginDatabase.cpp:
     16        (WebCore::PluginDatabase::installedPlugins):
     17        (WebCore::PluginDatabase::refresh):
     18        * plugins/PluginDatabase.h:
     19        (WebCore::PluginDatabase::setPluginDirectories):
     20        * plugins/gtk/PluginDatabaseGtk.cpp:
     21        (WebCore::PluginDatabase::getPluginsInDirectories):
     22        * plugins/win/PluginDatabaseWin.cpp:
     23        (WebCore::PluginDatabase::getPluginsInDirectories):
     24        (WebCore::safariPluginsDirectory):
     25        (WebCore::PluginDatabase::defaultPluginDirectories):
     26        (WebCore::PluginDatabase::isPreferredPluginDirectory):
     27        * plugins/win/PluginPackageWin.cpp:
     28        (WebCore::PluginPackage::compare):
     29
    1302008-03-29  Adam Roben  <aroben@apple.com>
    231

  • trunk/WebCore/platform/qt/TemporaryLinkStubs.cpp

    r31138 r31462  
    7373using namespace WebCore;
    7474
    75 PluginSet PluginDatabase::getPluginsInPaths() const { notImplemented(); return PluginSet(); }
    76 Vector<String> PluginDatabase::defaultPluginPaths() { notImplemented(); return Vector<String>(); }
     75PluginSet PluginDatabase::getPluginsInDirectories() const { notImplemented(); return PluginSet(); }
     76Vector<String> PluginDatabase::defaultPluginDirectories() { notImplemented(); return Vector<String>(); }
    7777bool PluginDatabase::isPreferredPluginPath(const String&) { notImplemented(); return false; }
    7878int PluginPackage::compare(const PluginPackage&) const { notImplemented(); return 0; }

  • trunk/WebCore/platform/wx/TemporaryLinkStubs.cpp

    r31275 r31462  
    117117void WebCore::findWordBoundary(UChar const* str,int len,int position,int* start, int* end) { notImplemented(); *start=position; *end=position; }
    118118
    119 PluginSet PluginDatabase::getPluginsInPaths() const { notImplemented(); return PluginSet(); }
    120 Vector<String> PluginDatabase::defaultPluginPaths() { notImplemented(); return Vector<String>(); }
     119PluginSet PluginDatabase::getPluginsInDirectories() const { notImplemented(); return PluginSet(); }
     120Vector<String> PluginDatabase::defaultPluginDirectories() { notImplemented(); return Vector<String>(); }
    121121bool PluginDatabase::isPreferredPluginPath(const String&) { notImplemented(); return false; }
    122122int PluginPackage::compare(const PluginPackage&) const { notImplemented(); return 0; }

  • trunk/WebCore/plugins/PluginDatabase.cpp

    r30698 r31462  
    4141    if (!plugins) {
    4242        plugins = new PluginDatabase;
    43         plugins->setPluginPaths(PluginDatabase::defaultPluginPaths());
     43        plugins->setPluginDirectories(PluginDatabase::defaultPluginDirectories());
    4444        plugins->refresh();
    4545    }
    … …  
    5858}
    5959
    60 void PluginDatabase::addExtraPluginPath(const String& path)
    61 {
    62     m_pluginPaths.append(path);
     60void PluginDatabase::addExtraPluginDirectory(const String& directory)
     61{
     62    m_pluginDirectories.append(directory);
    6363    refresh();
    6464}
    … …  
    7171
    7272    // Create a new set of plugins
    73     newPlugins = getPluginsInPaths();
     73    newPlugins = getPluginsInDirectories();
    7474
    7575    if (!m_plugins.isEmpty()) {

  • trunk/WebCore/plugins/PluginDatabase.h

    r30698 r31462  
    5151        Vector<PluginPackage*> plugins() const;
    5252        bool isMIMETypeRegistered(const String& mimeType);
    53         void addExtraPluginPath(const String&);
     53        void addExtraPluginDirectory(const String&);
    5454
    55         static bool isPreferredPluginPath(const String& path);
     55        static bool isPreferredPluginDirectory(const String& directory);
    5656        static int preferredPluginCompare(const void*, const void*);
    5757
    … …  
    5959
    6060    private:
    61         void setPluginPaths(const Vector<String>& paths) { m_pluginPaths = paths; }
    62         PluginSet getPluginsInPaths() const;
     61        void setPluginDirectories(const Vector<String>& directories) { m_pluginDirectories = directories; }
     62        PluginSet getPluginsInDirectories() const;
    6363
    6464        PluginPackage* pluginForMIMEType(const String& mimeType);
    6565        String MIMETypeForExtension(const String& extension) const;
    6666
    67         static Vector<String> defaultPluginPaths();
     67        static Vector<String> defaultPluginDirectories();
    6868
    69         Vector<String> m_pluginPaths;
     69        Vector<String> m_pluginDirectories;
    7070        HashSet<String> m_registeredMIMETypes;
    7171        PluginSet m_plugins;

  • trunk/WebCore/plugins/gtk/PluginDatabaseGtk.cpp

    r31459 r31462  
    3333namespace WebCore {
    3434
    35 PluginSet PluginDatabase::getPluginsInPaths() const
     35PluginSet PluginDatabase::getPluginsInDirectories() const
    3636{
    3737    // FIXME: This should be a case insensitive set.
    … …  
    3939    PluginSet plugins;
    4040
    41     Vector<String>::const_iterator end = m_pluginPaths.end();
    42     for (Vector<String>::const_iterator it = m_pluginPaths.begin(); it != end; ++it) {
     41    Vector<String>::const_iterator end = m_pluginDirectories.end();
     42    for (Vector<String>::const_iterator it = m_pluginDirectories.begin(); it != end; ++it) {
    4343        GDir* dir = g_dir_open((it->utf8()).data(), 0, 0);
    4444        if (!dir)
    … …  
    6161}
    6262
    63 Vector<String> PluginDatabase::defaultPluginPaths()
     63Vector<String> PluginDatabase::defaultPluginDirectories()
    6464{
    65     Vector<String> paths;
    66     gchar* path;
     65    Vector<String> directories;
     66    gchar* directory;
    6767
    6868#if defined(GDK_WINDOWING_X11)
    69     path = g_build_filename(g_get_home_dir(), ".mozilla", "plugins", 0);
    70     paths.append(path);
    71     g_free(path);
     69    directory = g_build_filename(g_get_home_dir(), ".mozilla", "plugins", 0);
     70    directories.append(directory);
     71    g_free(directory);
    7272
    7373    const gchar* mozPath = g_getenv("MOZ_PLUGIN_PATH");
    … …  
    7676
    7777        for (gint i = 0; pluginPaths[i]; i++)
    78             paths.append(pluginPaths[i]);
     78            directories.append(pluginPaths[i]);
    7979
    8080        g_strfreev(pluginPaths);
    8181    }
    8282
    83     path = g_build_filename(G_DIR_SEPARATOR_S "usr", "lib", "browser", "plugins", 0);
    84     paths.append(path);
    85     g_free(path);
    86     path = g_build_filename(G_DIR_SEPARATOR_S "usr", "local", "lib", "mozilla", "plugins", 0);
    87     paths.append(path);
    88     g_free (path);
    89     path = g_build_filename(G_DIR_SEPARATOR_S "usr", "lib", "mozilla", "plugins", 0);
    90     paths.append(path);
    91     g_free (path);
     83    directory = g_build_filename(G_DIR_SEPARATOR_S "usr", "lib", "browser", "plugins", 0);
     84    directories.append(directory);
     85    g_free(directory);
     86    directory = g_build_filename(G_DIR_SEPARATOR_S "usr", "local", "lib", "mozilla", "plugins", 0);
     87    directories.append(directory);
     88    g_free (directory);
     89    directory = g_build_filename(G_DIR_SEPARATOR_S "usr", "lib", "mozilla", "plugins", 0);
     90    directories.append(directory);
     91    g_free (directory);
    9292#elif defined(GDK_WINDOWING_WIN32)
    93     path = g_build_filename(g_get_home_dir(), "Application Data", "Mozilla", "plugins", 0);
    94     paths.append(path);
    95     g_free(path);
     93    directory = g_build_filename(g_get_home_dir(), "Application Data", "Mozilla", "plugins", 0);
     94    directories.append(directory);
     95    g_free(directory);
    9696#endif
    9797
    98     return paths;
     98    return directories;
    9999}
    100100
    101 bool PluginDatabase::isPreferredPluginPath(const String& path)
     101bool PluginDatabase::isPreferredPluginDirectory(const String& directory)
    102102{
    103103    return false;

  • trunk/WebCore/plugins/win/PluginDatabaseWin.cpp

    r31460 r31462  
    7878}
    7979
    80 PluginSet PluginDatabase::getPluginsInPaths() const
     80PluginSet PluginDatabase::getPluginsInDirectories() const
    8181{
    8282    // FIXME: This should be a case insensitive set.
    … …  
    9090    RefPtr<PluginPackage> newWMPPlugin;
    9191
    92     Vector<String>::const_iterator end = m_pluginPaths.end();
    93     for (Vector<String>::const_iterator it = m_pluginPaths.begin(); it != end; ++it) {
     92    Vector<String>::const_iterator end = m_pluginDirectories.end();
     93    for (Vector<String>::const_iterator it = m_pluginDirectories.begin(); it != end; ++it) {
    9494        String pattern = *it + "\\*";
    9595
    … …  
    181181}
    182182
    183 static inline void addMozillaPluginPaths(Vector<String>& paths)
     183static inline void addMozillaPluginDirectories(Vector<String>& directories)
    184184{
    185185    // Enumerate all Mozilla plugin directories in the registry
    … …  
    207207
    208208            if (result == ERROR_SUCCESS) {
    209                 // Now get the plugins path
    210                 WCHAR pluginsPathStr[_MAX_PATH];
    211                 DWORD pluginsPathSize = sizeof(pluginsPathStr);
     209                // Now get the plugins directory
     210                WCHAR pluginsDirectoryStr[_MAX_PATH];
     211                DWORD pluginsDirectorySize = sizeof(pluginsDirectoryStr);
    212212                DWORD type;
    213213
    214                 result = RegQueryValueEx(extensionsKey, TEXT("Plugins"), 0, &type, (LPBYTE)&pluginsPathStr, &pluginsPathSize);
     214                result = RegQueryValueEx(extensionsKey, TEXT("Plugins"), 0, &type, (LPBYTE)&pluginsDirectoryStr, &pluginsDirectorySize);
    215215
    216216                if (result == ERROR_SUCCESS && type == REG_SZ)
    217                     paths.append(String(pluginsPathStr, pluginsPathSize / sizeof(WCHAR) - 1));
     217                    directories.append(String(pluginsDirectoryStr, pluginsDirectorySize / sizeof(WCHAR) - 1));
    218218
    219219                RegCloseKey(extensionsKey);
    … …  
    225225}
    226226
    227 static inline void addWindowsMediaPlayerPluginPath(Vector<String>& paths)
     227static inline void addWindowsMediaPlayerPluginDirectory(Vector<String>& directories)
    228228{
    229229    // The new WMP Firefox plugin is installed in \PFiles\Plugins if it can't find any Firefox installs
    … …  
    232232
    233233    if (pluginDirectorySize > 0 && pluginDirectorySize <= _countof(pluginDirectoryStr))
    234         paths.append(String(pluginDirectoryStr, pluginDirectorySize - 1));
     234        directories.append(String(pluginDirectoryStr, pluginDirectorySize - 1));
    235235
    236236    DWORD type;
    … …  
    241241
    242242    if (result == ERROR_SUCCESS && type == REG_SZ)
    243         paths.append(String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1));
    244 }
    245 
    246 static inline void addQuickTimePluginPath(Vector<String>& paths)
     243        directories.append(String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1));
     244}
     245
     246static inline void addQuickTimePluginDirectory(Vector<String>& directories)
    247247{
    248248    DWORD type;
    … …  
    254254    if (result == ERROR_SUCCESS && type == REG_SZ) {
    255255        String pluginDir = String(installationDirectoryStr, installationDirectorySize / sizeof(WCHAR) - 1) + "\\plugins";
    256         paths.append(pluginDir);
    257     }
    258 }
    259 
    260 static inline void addAdobeAcrobatPluginPath(Vector<String>& paths)
     256        directories.append(pluginDir);
     257    }
     258}
     259
     260static inline void addAdobeAcrobatPluginDirectory(Vector<String>& directories)
    261261{
    262262    HKEY key;
    … …  
    295295
    296296        if (result == ERROR_SUCCESS) {
    297             String acrobatPluginPath = String(acrobatInstallPathStr, acrobatInstallPathSize / sizeof(WCHAR) - 1) + "\\browser";
    298             paths.append(acrobatPluginPath);
     297            String acrobatPluginDirectory = String(acrobatInstallPathStr, acrobatInstallPathSize / sizeof(WCHAR) - 1) + "\\browser";
     298            directories.append(acrobatPluginDirectory);
    299299        }
    300300    }
    … …  
    303303}
    304304
    305 static inline String safariPluginsPath()
     305static inline String safariPluginsDirectory()
    306306{
    307307    WCHAR moduleFileNameStr[_MAX_PATH];
    308     static String pluginsPath;
    309     static bool cachedPluginPath = false;
    310 
    311     if (!cachedPluginPath) {
    312         cachedPluginPath = true;
     308    static String pluginsDirectory;
     309    static bool cachedPluginDirectory = false;
     310
     311    if (!cachedPluginDirectory) {
     312        cachedPluginDirectory = true;
    313313
    314314        int moduleFileNameLen = GetModuleFileName(0, moduleFileNameStr, _MAX_PATH);
    … …  
    320320            goto exit;
    321321
    322         pluginsPath = String(moduleFileNameStr) + "\\Plugins";
     322        pluginsDirectory = String(moduleFileNameStr) + "\\Plugins";
    323323    }
    324324exit:
    325     return pluginsPath;
    326 }
    327 
    328 static inline void addMacromediaPluginPaths(Vector<String>& paths)
     325    return pluginsDirectory;
     326}
     327
     328static inline void addMacromediaPluginDirectories(Vector<String>& directories)
    329329{
    330330    WCHAR systemDirectoryStr[MAX_PATH];
    … …  
    336336
    337337    PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Flash"));
    338     paths.append(macromediaDirectoryStr);
     338    directories.append(macromediaDirectoryStr);
    339339
    340340    PathCombine(macromediaDirectoryStr, systemDirectoryStr, TEXT("macromed\\Shockwave 10"));
    341     paths.append(macromediaDirectoryStr);
    342 }
    343 
    344 Vector<String> PluginDatabase::defaultPluginPaths()
    345 {
    346     Vector<String> paths;
    347     String ourPath = safariPluginsPath();
    348 
    349     if (!ourPath.isNull())
    350         paths.append(ourPath);
    351     addQuickTimePluginPath(paths);
    352     addAdobeAcrobatPluginPath(paths);
    353     addMozillaPluginPaths(paths);
    354     addWindowsMediaPlayerPluginPath(paths);
    355     addMacromediaPluginPaths(paths);
    356 
    357     return paths;
    358 }
    359 
    360 bool PluginDatabase::isPreferredPluginPath(const String& path)
    361 {
    362     String ourPath = safariPluginsPath();
    363 
    364     if (!ourPath.isNull() && !path.isNull())
    365         return ourPath == path;
     341    directories.append(macromediaDirectoryStr);
     342}
     343
     344Vector<String> PluginDatabase::defaultPluginDirectories()
     345{
     346    Vector<String> directories;
     347    String ourDirectory = safariPluginsDirectory();
     348
     349    if (!ourDirectory.isNull())
     350        directories.append(ourDirectory);
     351    addQuickTimePluginDirectory(directories);
     352    addAdobeAcrobatPluginDirectory(directories);
     353    addMozillaPluginDirectories(directories);
     354    addWindowsMediaPlayerPluginDirectory(directories);
     355    addMacromediaPluginDirectories(directories);
     356
     357    return directories;
     358}
     359
     360bool PluginDatabase::isPreferredPluginDirectory(const String& directory)
     361{
     362    String ourDirectory = safariPluginsDirectory();
     363
     364    if (!ourDirectory.isNull() && !directory.isNull())
     365        return ourDirectory == directory;
    366366
    367367    return false;

  • trunk/WebCore/plugins/win/PluginPackageWin.cpp

    r31458 r31462  
    7676
    7777    // Sort plug-ins in a preferred path first.
    78     bool AisInPreferredPath = PluginDatabase::isPreferredPluginPath(parentDirectory());
    79     bool BisInPreferredPath = PluginDatabase::isPreferredPluginPath(compareTo.parentDirectory());
     78    bool AisInPreferredPath = PluginDatabase::isPreferredPluginDirectory(parentDirectory());
     79    bool BisInPreferredPath = PluginDatabase::isPreferredPluginDirectory(compareTo.parentDirectory());
    8080    if (AisInPreferredPath != BisInPreferredPath)
    8181        return AisInPreferredPath ? -1 : 1;

  • trunk/WebKit/win/ChangeLog

    r31352 r31462  
     12008-03-29  Adam Roben  <aroben@apple.com>
     2
     3        Rename IWebViewPrivate::addAdditionalPluginPath to
     4        addAdditionalPluginDirectory
     5
     6        Reviewed by Mitz Pettel.
     7
     8        * Interfaces/IWebViewPrivate.idl:
     9        * Interfaces/WebKit.idl: Touched to make sure the Interfaces project
     10        rebuilds.
     11        * WebView.cpp:
     12        (WebView::addAdditionalPluginDirectory):
     13        * WebView.h:
     14
    1152008-03-26  Brent Fulgham  <bfulgham@gmail.com>
    216

  • trunk/WebKit/win/Interfaces/IWebViewPrivate.idl

    r31156 r31462  
    9595
    9696    HRESULT setAllowSiteSpecificHacks([in] BOOL allows);
    97     HRESULT addAdditionalPluginPath([in] BSTR path);
     97    HRESULT addAdditionalPluginDirectory([in] BSTR directory);
    9898
    9999    HRESULT loadBackForwardListFromOtherView([in] IWebView* otherView);

  • trunk/WebKit/win/Interfaces/WebKit.idl

    r31280 r31462  
    2121 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    2222 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
     23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424 */
    2525

  • trunk/WebKit/win/WebView.cpp

    r31186 r31462  
    42754275}
    42764276
    4277 HRESULT STDMETHODCALLTYPE WebView::addAdditionalPluginPath(
    4278         /* [in] */ BSTR path)
    4279 {
    4280     PluginDatabase::installedPlugins()->addExtraPluginPath(String(path, SysStringLen(path)));
     4277HRESULT STDMETHODCALLTYPE WebView::addAdditionalPluginDirectory(
     4278        /* [in] */ BSTR directory)
     4279{
     4280    PluginDatabase::installedPlugins()->addExtraPluginDirectory(String(directory, SysStringLen(directory)));
    42814281    return S_OK;
    42824282}

  • trunk/WebKit/win/WebView.h

    r31180 r31462  
    642642        /* [in] */ BOOL allows);
    643643
    644     virtual HRESULT STDMETHODCALLTYPE addAdditionalPluginPath(
    645         /* [in] */ BSTR path);   
     644    virtual HRESULT STDMETHODCALLTYPE addAdditionalPluginDirectory(
     645        /* [in] */ BSTR directory);   
    646646
    647647    virtual HRESULT STDMETHODCALLTYPE loadBackForwardListFromOtherView(

  • trunk/WebKitTools/ChangeLog

    r31334 r31462  
     12008-03-29  Adam Roben  <aroben@apple.com>
     2
     3        Update for rename of an IWebViewPrivate method
     4
     5        Reviewed by Mitz Pettel.
     6
     7        * DumpRenderTree/win/DumpRenderTree.cpp:
     8        (createWebViewAndOffscreenWindow):
     9
    1102008-03-26  Antti Koivisto  <antti@apple.com>
    211

  • trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp

    r31271 r31462  
    965965    _tcscpy(pluginPath, exePath().c_str());
    966966    _tcscat(pluginPath, TestPluginDir);
    967     failed = FAILED(viewPrivate->addAdditionalPluginPath(pluginPath));
     967    failed = FAILED(viewPrivate->addAdditionalPluginDirectory(pluginPath));
    968968    SysFreeString(pluginPath);
    969969    if (failed)
Note: See TracChangeset for help on using the changeset viewer.