Changeset 83772 in webkit


Ignore:
Timestamp:
Apr 13, 2011 3:11:30 PM (13 years ago)
Author:
sfalken@apple.com
Message:

2011-04-13 Steve Falkenburg <sfalken@apple.com>

Reviewed by Adam Roben.

Follow-up to: WebKit2 will load two copies of the same plugin, but should not
https://bugs.webkit.org/show_bug.cgi?id=49075


Use pathGetFileName instead of Win32 PathFindFileNameW.

  • UIProcess/Plugins/win/PluginInfoStoreWin.cpp: (WebKit::PluginInfoStore::shouldUsePlugin):
Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r83770 r83772  
     12011-04-13  Steve Falkenburg  <sfalken@apple.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        Follow-up to: WebKit2 will load two copies of the same plugin, but should not
     6        https://bugs.webkit.org/show_bug.cgi?id=49075
     7       
     8        Use pathGetFileName instead of Win32 PathFindFileNameW.
     9
     10        * UIProcess/Plugins/win/PluginInfoStoreWin.cpp:
     11        (WebKit::PluginInfoStore::shouldUsePlugin):
     12
    1132011-04-13  Sam Weinig  <sam@webkit.org>
    214
  • trunk/Source/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp

    r83769 r83772  
    2828
    2929#include "NetscapePluginModule.h"
     30#include <WebCore/FileSystem.h>
    3031#include <WebCore/PathWalker.h>
    3132#include <shlwapi.h>
     
    393394    // FIXME: We should prefer a newer version of a plugin to an older version, rather than loading
    394395    // only the first. <http://webkit.org/b/58469>
    395     String pluginPath = plugin.path;
    396     String pluginFileName(::PathFindFileNameW(pluginPath.charactersWithNullTermination()));
     396    String pluginFileName = pathGetFileName(plugin.path);
    397397    for (size_t i = 0; i < m_plugins.size(); ++i) {
    398398        Plugin& loadedPlugin = m_plugins[i];
    399399
    400400        // If a plug-in with the same filename already exists, we don't want to load it.
    401         String loadedPluginFileName(::PathFindFileNameW(loadedPlugin.path.charactersWithNullTermination()));
    402         if (equalIgnoringCase(pluginFileName, loadedPluginFileName))
     401        if (equalIgnoringCase(pluginFileName, pathGetFileName(loadedPlugin.path)))
    403402            return false;
    404403    }
Note: See TracChangeset for help on using the changeset viewer.