Changeset 130347 in webkit


Ignore:
Timestamp:
Oct 3, 2012 4:54:59 PM (12 years ago)
Author:
andersca@apple.com
Message:

Plugins are killed after 45 seconds if showing keychain "Allow/Deny" dialog
​https://bugs.webkit.org/show_bug.cgi?id=85138
<rdar://problem/11406430>

Reviewed by Andreas Kling.

Remove the watchdog that would kill a plug-in if we've been waiting for a sync reply from it for more than 45 seconds.
It's unlikely that someone is going to wait 45 seconds for Safari to recover from a plug-in hang, and the timeout is
causing problems with plug-ins (see the bugzilla bug for more information).

  • Platform/CoreIPC/Connection.cpp:

(CoreIPC::Connection::Connection):
(CoreIPC::Connection::waitForSyncReply):

  • Platform/CoreIPC/Connection.h:

(Client):
(Connection):

  • PluginProcess/PluginProcess.cpp:
  • PluginProcess/PluginProcess.h:

(PluginProcess):

  • PluginProcess/WebProcessConnection.cpp:
  • PluginProcess/WebProcessConnection.h:

(WebProcessConnection):

  • Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):

  • Shared/WebProcessCreationParameters.h:

(WebProcessCreationParameters):

  • UIProcess/Plugins/PluginProcessManager.cpp:
  • UIProcess/Plugins/PluginProcessManager.h:

(PluginProcessManager):

  • UIProcess/Plugins/PluginProcessProxy.cpp:
  • UIProcess/Plugins/PluginProcessProxy.h:

(PluginProcessProxy):

  • UIProcess/WebConnectionToWebProcess.cpp:
  • UIProcess/WebConnectionToWebProcess.h:

(WebConnectionToWebProcess):

  • UIProcess/WebProcessProxy.cpp:
  • UIProcess/WebProcessProxy.h:

(WebProcessProxy):

  • UIProcess/WebProcessProxy.messages.in:
  • UIProcess/mac/WebContextMac.mm:

(WebKit::WebContext::platformInitializeWebProcess):

  • WebProcess/Plugins/PluginProcessConnection.cpp:

(WebKit::PluginProcessConnection::PluginProcessConnection):

  • WebProcess/Plugins/PluginProcessConnection.h:

(PluginProcessConnection):

  • WebProcess/WebConnectionToUIProcess.cpp:
  • WebProcess/WebConnectionToUIProcess.h:

(WebConnectionToUIProcess):

  • WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::runJavaScriptAlert):
(WebKit::WebChromeClient::runJavaScriptConfirm):
(WebKit::WebChromeClient::runJavaScriptPrompt):

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::initializeWebProcess):

  • WebProcess/WebProcess.h:

(WebProcess):

Location:
trunk/Source/WebKit2
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r130327 r130347  
     12012-10-03  Anders Carlsson  <andersca@apple.com>
     2
     3        Plugins are killed after 45 seconds if showing keychain "Allow/Deny" dialog
     4        https://bugs.webkit.org/show_bug.cgi?id=85138
     5        <rdar://problem/11406430>
     6
     7        Reviewed by Andreas Kling.
     8
     9        Remove the watchdog that would kill a plug-in if we've been waiting for a sync reply from it for more than 45 seconds.
     10        It's unlikely that someone is going to wait 45 seconds for Safari to recover from a plug-in hang, and the timeout is
     11        causing problems with plug-ins (see the bugzilla bug for more information).
     12
     13        * Platform/CoreIPC/Connection.cpp:
     14        (CoreIPC::Connection::Connection):
     15        (CoreIPC::Connection::waitForSyncReply):
     16        * Platform/CoreIPC/Connection.h:
     17        (Client):
     18        (Connection):
     19        * PluginProcess/PluginProcess.cpp:
     20        * PluginProcess/PluginProcess.h:
     21        (PluginProcess):
     22        * PluginProcess/WebProcessConnection.cpp:
     23        * PluginProcess/WebProcessConnection.h:
     24        (WebProcessConnection):
     25        * Shared/WebProcessCreationParameters.cpp:
     26        (WebKit::WebProcessCreationParameters::encode):
     27        (WebKit::WebProcessCreationParameters::decode):
     28        * Shared/WebProcessCreationParameters.h:
     29        (WebProcessCreationParameters):
     30        * UIProcess/Plugins/PluginProcessManager.cpp:
     31        * UIProcess/Plugins/PluginProcessManager.h:
     32        (PluginProcessManager):
     33        * UIProcess/Plugins/PluginProcessProxy.cpp:
     34        * UIProcess/Plugins/PluginProcessProxy.h:
     35        (PluginProcessProxy):
     36        * UIProcess/WebConnectionToWebProcess.cpp:
     37        * UIProcess/WebConnectionToWebProcess.h:
     38        (WebConnectionToWebProcess):
     39        * UIProcess/WebProcessProxy.cpp:
     40        * UIProcess/WebProcessProxy.h:
     41        (WebProcessProxy):
     42        * UIProcess/WebProcessProxy.messages.in:
     43        * UIProcess/mac/WebContextMac.mm:
     44        (WebKit::WebContext::platformInitializeWebProcess):
     45        * WebProcess/Plugins/PluginProcessConnection.cpp:
     46        (WebKit::PluginProcessConnection::PluginProcessConnection):
     47        * WebProcess/Plugins/PluginProcessConnection.h:
     48        (PluginProcessConnection):
     49        * WebProcess/WebConnectionToUIProcess.cpp:
     50        * WebProcess/WebConnectionToUIProcess.h:
     51        (WebConnectionToUIProcess):
     52        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
     53        (WebKit::WebChromeClient::runJavaScriptAlert):
     54        (WebKit::WebChromeClient::runJavaScriptConfirm):
     55        (WebKit::WebChromeClient::runJavaScriptPrompt):
     56        * WebProcess/WebProcess.cpp:
     57        (WebKit::WebProcess::WebProcess):
     58        (WebKit::WebProcess::initializeWebProcess):
     59        * WebProcess/WebProcess.h:
     60        (WebProcess):
     61
    1622012-10-03  Hugo Parente Lima  <hugo.lima@openbossa.org>
    263

  • trunk/Source/WebKit2/Platform/CoreIPC/Connection.cpp

    r130207 r130347  
    204204    , m_inDispatchMessageMarkedDispatchWhenWaitingForSyncReplyCount(0)
    205205    , m_didReceiveInvalidMessage(false)
    206     , m_defaultSyncMessageTimeout(NoTimeout)
    207206    , m_syncMessageState(SyncMessageState::getOrCreate(clientRunLoop))
    208207    , m_shouldWaitForSyncReplies(true)
    … …  
    283282
    284283    m_didReceiveInvalidMessage = true;
    285 }
    286 
    287 void Connection::setDefaultSyncMessageTimeout(double defaultSyncMessageTimeout)
    288 {
    289     ASSERT(defaultSyncMessageTimeout != DefaultTimeout);
    290 
    291     m_defaultSyncMessageTimeout = defaultSyncMessageTimeout;
    292284}
    293285
    … …  
    428420PassOwnPtr<ArgumentDecoder> Connection::waitForSyncReply(uint64_t syncRequestID, double timeout, unsigned syncSendFlags)
    429421{
    430     if (timeout == DefaultTimeout)
    431         timeout = m_defaultSyncMessageTimeout;
    432 
    433422    // Use a really long timeout.
    434423    if (timeout == NoTimeout)
    … …  
    483472    }
    484473
    485     // We timed out.
    486     if (m_client)
    487         m_client->syncMessageSendTimedOut(this);
    488 
    489474    return nullptr;
    490475}

  • trunk/Source/WebKit2/Platform/CoreIPC/Connection.h

    r130207 r130347  
    9090        virtual void didClose(Connection*) = 0;
    9191        virtual void didReceiveInvalidMessage(Connection*, MessageID) = 0;
    92         virtual void syncMessageSendTimedOut(Connection*) = 0;
    9392
    9493#if PLATFORM(WIN)
    … …  
    182181    void markCurrentlyDispatchedMessageAsInvalid();
    183182
    184     void setDefaultSyncMessageTimeout(double);
    185 
    186183    void postConnectionDidCloseOnConnectionWorkQueue();
    187184
    188     static const int DefaultTimeout = 0;
    189185    static const int NoTimeout = -1;
    190186
    191187    template<typename T> bool send(const T& message, uint64_t destinationID, unsigned messageSendFlags = 0);
    192     template<typename T> bool sendSync(const T& message, const typename T::Reply& reply, uint64_t destinationID, double timeout = DefaultTimeout, unsigned syncSendFlags = 0);
     188    template<typename T> bool sendSync(const T& message, const typename T::Reply& reply, uint64_t destinationID, double timeout = NoTimeout, unsigned syncSendFlags = 0);
    193189    template<typename T> bool waitForAndDispatchImmediately(uint64_t destinationID, double timeout);
    194190
    … …  
    303299    bool m_didReceiveInvalidMessage;
    304300
    305     double m_defaultSyncMessageTimeout;
    306 
    307301    // Incoming messages.
    308302    Mutex m_incomingMessagesLock;

  • trunk/Source/WebKit2/PluginProcess/PluginProcess.cpp

    r128205 r130347  
    151151}
    152152
    153 void PluginProcess::syncMessageSendTimedOut(CoreIPC::Connection*)
    154 {
    155 }
    156 
    157153void PluginProcess::initializePluginProcess(const PluginProcessCreationParameters& parameters)
    158154{

  • trunk/Source/WebKit2/PluginProcess/PluginProcess.h

    r128236 r130347  
    7878    virtual void didClose(CoreIPC::Connection*);
    7979    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
    80     virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
    8180
    8281    // Message handlers.

  • trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp

    r125457 r130347  
    238238}
    239239
    240 void WebProcessConnection::syncMessageSendTimedOut(CoreIPC::Connection*)
    241 {
    242 }
    243 
    244240void WebProcessConnection::createPluginInternal(const PluginCreationParameters& creationParameters, bool& result, bool& wantsWheelEvents, uint32_t& remoteLayerClientID)
    245241{

  • trunk/Source/WebKit2/PluginProcess/WebProcessConnection.h

    r125457 r130347  
    6767    virtual void didClose(CoreIPC::Connection*);
    6868    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
    69     virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
    7069
    7170    // Message handlers.

  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

    r129593 r130347  
    7272    encoder->encode(shouldUseFontSmoothing);
    7373    encoder->encode(iconDatabaseEnabled);
    74 #if ENABLE(PLUGIN_PROCESS)
    75     encoder->encode(disablePluginProcessMessageTimeout);
    76 #endif
    7774    encoder->encode(terminationTimeout);
    7875    encoder->encode(languages);
    … …  
    161158    if (!decoder->decode(parameters.iconDatabaseEnabled))
    162159        return false;
    163 #if ENABLE(PLUGIN_PROCESS)
    164     if (!decoder->decode(parameters.disablePluginProcessMessageTimeout))
    165         return false;
    166 #endif
    167160    if (!decoder->decode(parameters.terminationTimeout))
    168161        return false;

  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

    r129593 r130347  
    8181    bool iconDatabaseEnabled;
    8282
    83 #if ENABLE(PLUGIN_PROCESS)
    84     bool disablePluginProcessMessageTimeout;
    85 #endif
    86 
    8783    double terminationTimeout;
    8884

  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp

    r110728 r130347  
    7575}
    7676
    77 void PluginProcessManager::pluginSyncMessageSendTimedOut(const String& pluginPath)
    78 {
    79     PluginProcessProxy* pluginProcess = pluginProcessWithPath(pluginPath);
    80     if (!pluginProcess)
    81         return;
    82 
    83     pluginProcess->terminate();
    84 }
    85 
    8677PluginProcessProxy* PluginProcessManager::pluginProcessWithPath(const String& pluginPath)
    8778{

  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h

    r110728 r130347  
    5757    void clearSiteData(const PluginModuleInfo&, WebPluginSiteDataManager*, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID);
    5858
    59     void pluginSyncMessageSendTimedOut(const String& pluginPath);
    60 
    6159private:
    6260    PluginProcessManager();

  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp

    r128205 r130347  
    189189}
    190190
    191 void PluginProcessProxy::syncMessageSendTimedOut(CoreIPC::Connection*)
    192 {
    193 }
    194 
    195191void PluginProcessProxy::didFinishLaunching(ProcessLauncher*, CoreIPC::Connection::Identifier connectionIdentifier)
    196192{

  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h

    r124815 r130347  
    102102    virtual void didClose(CoreIPC::Connection*);
    103103    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
    104     virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
    105104
    106105    // ProcessLauncher::Client

  • trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.cpp

    r128449 r130347  
    125125}
    126126
    127 void WebConnectionToWebProcess::syncMessageSendTimedOut(CoreIPC::Connection* connection)
    128 {
    129     m_process->syncMessageSendTimedOut(connection);
    130 }
    131 
    132127#if PLATFORM(WIN)
    133128Vector<HWND> WebConnectionToWebProcess::windowsToReceiveSentMessagesWhileWaitingForSyncReply()

  • trunk/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h

    r105475 r130347  
    5353    virtual void didClose(CoreIPC::Connection*);
    5454    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
    55     virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
    5655#if PLATFORM(WIN)
    5756    virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

    r130214 r130347  
    360360}
    361361
    362 void WebProcessProxy::pluginSyncMessageSendTimedOut(const String& pluginPath)
    363 {
    364     PluginProcessManager::shared().pluginSyncMessageSendTimedOut(pluginPath);
    365 }
    366 
    367362#else
    368363
    … …  
    481476}
    482477
    483 void WebProcessProxy::syncMessageSendTimedOut(CoreIPC::Connection*)
    484 {
    485 }
    486 
    487478void WebProcessProxy::didBecomeUnresponsive(ResponsivenessTimer*)
    488479{

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

    r130214 r130347  
    144144#if ENABLE(PLUGIN_PROCESS)
    145145    void getPluginProcessConnection(const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);
    146     void pluginSyncMessageSendTimedOut(const String& pluginPath);
    147146#else
    148147    void didGetSitesWithPluginData(const Vector<String>& sites, uint64_t callbackID);
    … …  
    164163    virtual void didClose(CoreIPC::Connection*);
    165164    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
    166     virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
    167165#if PLATFORM(WIN)
    168166    virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in

    r125451 r130347  
    3939#if ENABLE(PLUGIN_PROCESS)
    4040    GetPluginProcessConnection(WTF::String pluginPath) -> (CoreIPC::Attachment connectionHandle, bool supportsAsynchronousInitialization) Delayed
    41     PluginSyncMessageSendTimedOut(WTF::String pluginPath)
    4241#endif
    4342#if !ENABLE(PLUGIN_PROCESS)

  • trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm

    r129593 r130347  
    102102#endif
    103103
    104 #if ENABLE(PLUGIN_PROCESS)
    105     parameters.disablePluginProcessMessageTimeout = [[NSUserDefaults standardUserDefaults] boolForKey:@"WebKitDisablePluginProcessMessageTimeout"];
    106 #endif
    107 
    108104#if USE(ACCELERATED_COMPOSITING) && HAVE(HOSTED_CORE_ANIMATION)
    109105#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp

    r127202 r130347  
    4242namespace WebKit {
    4343
    44 // The timeout, in seconds, when sending sync messages to the plug-in.
    45 static const double syncMessageTimeout = 45;
    46 
    47 static double defaultSyncMessageTimeout(const String& pluginPath)
    48 {
    49     // FIXME: We should key this off something other than the path.
    50 
    51     // We don't want a message timeout for the AppleConnect plug-in.
    52     if (pathGetFileName(pluginPath) == "AppleConnect.plugin")
    53         return CoreIPC::Connection::NoTimeout;
    54 
    55     // We don't want a message timeout for the Microsoft SharePoint plug-in
    56     // since it can spin a nested run loop in response to an NPN_Invoke, making it seem like
    57     // the plug-in process is hung. See <rdar://problem/9536303>.
    58     // FIXME: Instead of changing the default sync message timeout, CoreIPC could send an
    59     // asynchronous message which the other process would have to reply to on the main thread.
    60     // This way we could check if the plug-in process is actually hung or not.
    61     if (pathGetFileName(pluginPath) == "SharePointBrowserPlugin.plugin")
    62         return CoreIPC::Connection::NoTimeout;
    63 
    64     // We don't want a message timeout for the BankID plug-in since it can spin a nested
    65     // run loop when it's waiting for a reply to an AppleEvent.
    66     if (pathGetFileName(pluginPath) == "PersonalPlugin.bundle")
    67         return CoreIPC::Connection::NoTimeout;
    68 
    69     if (WebProcess::shared().disablePluginProcessMessageTimeout())
    70         return CoreIPC::Connection::NoTimeout;
    71 
    72     return syncMessageTimeout;
    73 }
    74 
    7544PluginProcessConnection::PluginProcessConnection(PluginProcessConnectionManager* pluginProcessConnectionManager, const String& pluginPath, CoreIPC::Connection::Identifier connectionIdentifier, bool supportsAsynchronousPluginInitialization)
    7645    : m_pluginProcessConnectionManager(pluginProcessConnectionManager)
    … …  
    8049    m_connection = CoreIPC::Connection::createClientConnection(connectionIdentifier, this, WebProcess::shared().runLoop());
    8150
    82     m_connection->setDefaultSyncMessageTimeout(defaultSyncMessageTimeout(m_pluginPath));
    8351    m_npRemoteObjectMap = NPRemoteObjectMap::create(m_connection.get());
    8452
    … …  
    166134}
    167135
    168 void PluginProcessConnection::syncMessageSendTimedOut(CoreIPC::Connection*)
    169 {
    170     WebProcess::shared().connection()->send(Messages::WebProcessProxy::PluginSyncMessageSendTimedOut(m_pluginPath), 0);
    171 }
    172 
    173136void PluginProcessConnection::setException(const String& exceptionString)
    174137{

  • trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.h

    r124815 r130347  
    6969    virtual void didClose(CoreIPC::Connection*);
    7070    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
    71     virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
    7271
    7372    // Message handlers.

  • trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.cpp

    r105475 r130347  
    103103}
    104104
    105 void WebConnectionToUIProcess::syncMessageSendTimedOut(CoreIPC::Connection* connection)
    106 {
    107     m_process->syncMessageSendTimedOut(connection);
    108 }
    109 
    110105#if PLATFORM(WIN)
    111106Vector<HWND> WebConnectionToUIProcess::windowsToReceiveSentMessagesWhileWaitingForSyncReply()

  • trunk/Source/WebKit2/WebProcess/WebConnectionToUIProcess.h

    r105475 r130347  
    5353    virtual void didClose(CoreIPC::Connection*);
    5454    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
    55     virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
    5655#if PLATFORM(WIN)
    5756    virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

    r130208 r130347  
    315315
    316316    unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? CoreIPC::SpinRunLoopWhileWaitingForReply : 0;
    317     WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), CoreIPC::Connection::DefaultTimeout, syncSendFlags);
     317    WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags);
    318318}
    319319
    … …  
    327327    unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? CoreIPC::SpinRunLoopWhileWaitingForReply : 0;
    328328    bool result = false;
    329     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), CoreIPC::Connection::DefaultTimeout, syncSendFlags))
     329    if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags))
    330330        return false;
    331331
    … …  
    341341
    342342    unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? CoreIPC::SpinRunLoopWhileWaitingForReply : 0;
    343     if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), CoreIPC::Connection::DefaultTimeout, syncSendFlags))
     343    if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), CoreIPC::Connection::NoTimeout, syncSendFlags))
    344344        return false;
    345345

  • trunk/Source/WebKit2/WebProcess/WebProcess.cpp

    r130316 r130347  
    160160#endif
    161161    , m_iconDatabaseProxy(this)
    162 #if ENABLE(PLUGIN_PROCESS)
    163     , m_disablePluginProcessMessageTimeout(false)
    164 #endif
    165162#if USE(SOUP)
    166163    , m_soupRequestManager(this)
    … …  
    262259#if USE(CFURLSTORAGESESSIONS)
    263260    WebCore::ResourceHandle::setPrivateBrowsingStorageSessionIdentifierBase(parameters.uiProcessBundleIdentifier);
    264 #endif
    265 
    266 #if ENABLE(PLUGIN_PROCESS)
    267     m_disablePluginProcessMessageTimeout = parameters.disablePluginProcessMessageTimeout;
    268261#endif
    269262
    … …  
    760753    // We received an invalid message, but since this is from the UI process (which we trust),
    761754    // we'll let it slide.
    762 }
    763 
    764 void WebProcess::syncMessageSendTimedOut(CoreIPC::Connection*)
    765 {
    766755}
    767756

  • trunk/Source/WebKit2/WebProcess/WebProcess.h

    r129593 r130347  
    183183#if ENABLE(PLUGIN_PROCESS)
    184184    PluginProcessConnectionManager& pluginProcessConnectionManager() { return m_pluginProcessConnectionManager; }
    185     bool disablePluginProcessMessageTimeout() const { return m_disablePluginProcessMessageTimeout; }
    186185#endif
    187186
    … …  
    267266    virtual void didClose(CoreIPC::Connection*);
    268267    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID);
    269     virtual void syncMessageSendTimedOut(CoreIPC::Connection*);
    270268#if PLATFORM(WIN)
    271269    virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();
    … …  
    340338#if ENABLE(PLUGIN_PROCESS)
    341339    PluginProcessConnectionManager m_pluginProcessConnectionManager;
    342     bool m_disablePluginProcessMessageTimeout;
    343340#endif
    344341
Note: See TracChangeset for help on using the changeset viewer.