Changeset 138764 in webkit

Timestamp:

Jan 3, 2013, 4:31:47 PM (13 years ago)

Author:

jonlee@apple.com

Message:

REGRESSION(r138729): crash and assertion failures in WebKit::WebProcess::plugInDidReceiveUserInteraction
​https://bugs.webkit.org/show_bug.cgi?id=106042
<rdar://problem/12953469>

Reviewed by Brady Eidson.

Source/WebKit2:

The assertion is hit if plugin snapshotting is disabled, and the user interacts with a plug-in that
comes from an origin not found in the cached dictionary. The proper fix is to check for whether the
setting is enabled. Otherwise, that origin should be in the dictionary since the plugin is running.

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::pluginDidReceiveUserInteraction): Check for the setting, and avoid the whole code
path if snapshotting is disabled.

LayoutTests:

• platform/mac-wk2/TestExpectations: Unskip the crashing tests.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-03  Jon Lee  <jonlee@apple.com>
+
+        REGRESSION(r138729): crash and assertion failures in WebKit::WebProcess::plugInDidReceiveUserInteraction
+        https://bugs.webkit.org/show_bug.cgi?id=106042
+        <rdar://problem/12953469>
+
+        Reviewed by Brady Eidson.
+
+        * platform/mac-wk2/TestExpectations: Unskip the crashing tests.
+
 2013-01-03  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -297 +297 @@
 webkit.org/b/93552 inspector/device-orientation-success.html [ Failure ]
 
-webkit.org/b/106042 fast/replaced/no-focus-ring-object.html [ Crash ]
-webkit.org/b/106042 fast/replaced/no-focus-ring-embed.html [ Crash ]
-webkit.org/b/106042 platform/mac-wk2/plugins/mouse-events-scaled-iframe.html [ Crash ]
-webkit.org/b/106042 plugins/change-widget-and-click-crash.html [ Crash ]
-webkit.org/b/106042 plugins/resize-from-plugin.html [ Crash ]
-
 ### END OF (1) Classified failures with bug reports
 ########################################

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-03  Jon Lee  <jonlee@apple.com>
+
+        REGRESSION(r138729): crash and assertion failures in WebKit::WebProcess::plugInDidReceiveUserInteraction
+        https://bugs.webkit.org/show_bug.cgi?id=106042
+        <rdar://problem/12953469>
+
+        Reviewed by Brady Eidson.
+
+        The assertion is hit if plugin snapshotting is disabled, and the user interacts with a plug-in that
+        comes from an origin not found in the cached dictionary. The proper fix is to check for whether the
+        setting is enabled. Otherwise, that origin should be in the dictionary since the plugin is running.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::pluginDidReceiveUserInteraction): Check for the setting, and avoid the whole code
+        path if snapshotting is disabled.
+
 2013-01-03  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -1610 +1610 @@
 void PluginView::pluginDidReceiveUserInteraction()
 {
+    if (frame() && !frame()->settings()->plugInSnapshottingEnabled())
+        return;
+
     if (m_didReceiveUserInteraction)
         return;