Changeset 142409 in webkit


Ignore:
Timestamp:
Feb 10, 2013 9:55:59 AM (11 years ago)
Author:
andersca@apple.com
Message:

Add back code that was accidentally removed when moving plug-in enumeration back to the main thread
https://bugs.webkit.org/show_bug.cgi?id=109379

Reviewed by Andreas Kling.

  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::getPlugins):

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r142405 r142409  
     12013-02-10  Anders Carlsson  <andersca@apple.com>
     2
     3        Add back code that was accidentally removed when moving plug-in enumeration back to the main thread
     4        https://bugs.webkit.org/show_bug.cgi?id=109379
     5
     6        Reviewed by Andreas Kling.
     7
     8        * UIProcess/WebProcessProxy.cpp:
     9        (WebKit::WebProcessProxy::getPlugins):
     10
    1112013-02-10  Kent Tamura  <tkent@chromium.org>
    212
  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

    r142339 r142409  
    307307    for (size_t i = 0; i < pluginModules.size(); ++i)
    308308        plugins.append(pluginModules[i].info);
     309
     310#if PLATFORM(MAC)
     311    // Add built-in PDF last, so that it's not used when a real plug-in is installed.
     312    if (!m_context->omitPDFSupport()) {
     313#if ENABLE(PDFKIT_PLUGIN)
     314        plugins.append(PDFPlugin::pluginInfo());
     315#endif
     316        plugins.append(SimplePDFPlugin::pluginInfo());
     317    }
     318#endif
    309319}
    310320#endif // ENABLE(NETSCAPE_PLUGIN_API)
    311321
    312322#if ENABLE(PLUGIN_PROCESS)
    313 
    314323void WebProcessProxy::getPluginProcessConnection(const String& pluginPath, uint32_t processType, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply)
    315324{
Note: See TracChangeset for help on using the changeset viewer.