Changeset 166907 in webkit


Ignore:
Timestamp:
Apr 7, 2014 8:49:37 PM (10 years ago)
Author:
Stephanie Lewis
Message:

Crash in com.apple.WebKit.Plugin.Development at com.apple.WebKit2: WebKit::PluginControllerProxy::pluginInstanceID
<rdar://problem/16479432>
https://bugs.webkit.org/show_bug.cgi?id=131203

Reviewed by Geoff Garen.

pluginController was being removed before accessing the pluginInstanceID.

  • PluginProcess/WebProcessConnection.cpp:

(WebKit::WebProcessConnection::removePluginControllerProxy):

Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r166906 r166907  
     12014-04-07  Stephanie Lewis  <slewis@apple.com>
     2
     3        Crash in com.apple.WebKit.Plugin.Development at com.apple.WebKit2: WebKit::PluginControllerProxy::pluginInstanceID
     4        <rdar://problem/16479432>
     5        https://bugs.webkit.org/show_bug.cgi?id=131203
     6
     7        Reviewed by Geoff Garen.
     8
     9        pluginController was being removed before accessing the pluginInstanceID.
     10
     11        * PluginProcess/WebProcessConnection.cpp:
     12        (WebKit::WebProcessConnection::removePluginControllerProxy):
     13
    1142014-04-07  Dan Bernstein  <mitz@apple.com>
    215
  • trunk/Source/WebKit2/PluginProcess/WebProcessConnection.cpp

    r166444 r166907  
    8686void WebProcessConnection::removePluginControllerProxy(PluginControllerProxy* pluginController, Plugin* plugin)
    8787{
     88    unsigned pluginInstanceID = pluginController->pluginInstanceID();
    8889    {
    89         ASSERT(m_pluginControllers.contains(pluginController->pluginInstanceID()));
    90 
    91         std::unique_ptr<PluginControllerProxy> pluginControllerUniquePtr = m_pluginControllers.take(pluginController->pluginInstanceID());
     90        ASSERT(m_pluginControllers.contains(pluginInstanceID));
     91
     92        std::unique_ptr<PluginControllerProxy> pluginControllerUniquePtr = m_pluginControllers.take(pluginInstanceID);
    9293        ASSERT(pluginControllerUniquePtr.get() == pluginController);
    9394    }
    9495
    95     pluginDidBecomeHidden(pluginController->pluginInstanceID());
     96    pluginDidBecomeHidden(pluginInstanceID);
    9697
    9798    // Invalidate all objects related to this plug-in.
Note: See TracChangeset for help on using the changeset viewer.