Title: [147168] trunk/Source/WebKit2
- Revision
- 147168
- Author
- [email protected]
- Date
- 2013-03-28 15:07:16 -0700 (Thu, 28 Mar 2013)
Log Message
[wk2] REGRESSION (r125500): WebFrameLoaderClient's active m_pluginView can be zeroed by PluginDocuments leaving the page cache
https://bugs.webkit.org/show_bug.cgi?id=113430
<rdar://problem/12729564>
Reviewed by Brady Eidson.
http://trac.webkit.org/changeset/147152 was wrong, and should have been
(as the ChangeLog stated) testing the argument to redirectDataToPlugin,
not the value of m_pluginView.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::redirectDataToPlugin):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (147167 => 147168)
--- trunk/Source/WebKit2/ChangeLog 2013-03-28 22:07:12 UTC (rev 147167)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-28 22:07:16 UTC (rev 147168)
@@ -6,6 +6,21 @@
Reviewed by Brady Eidson.
+ http://trac.webkit.org/changeset/147152 was wrong, and should have been
+ (as the ChangeLog stated) testing the argument to redirectDataToPlugin,
+ not the value of m_pluginView.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::redirectDataToPlugin):
+
+2013-03-28 Tim Horton <[email protected]>
+
+ [wk2] REGRESSION (r125500): WebFrameLoaderClient's active m_pluginView can be zeroed by PluginDocuments leaving the page cache
+ https://bugs.webkit.org/show_bug.cgi?id=113430
+ <rdar://problem/12729564>
+
+ Reviewed by Brady Eidson.
+
Ignore redirectDataToPlugin(0), which is only called from PluginDocument::detach(),
and only after r125500. Otherwise, PluginDocuments that are put into the page cache
but leave later can clear a totally different and legitimate PluginView from the
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (147167 => 147168)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-03-28 22:07:12 UTC (rev 147167)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-03-28 22:07:16 UTC (rev 147168)
@@ -1346,7 +1346,7 @@
void WebFrameLoaderClient::redirectDataToPlugin(Widget* pluginWidget)
{
- if (m_pluginView)
+ if (pluginWidget)
m_pluginView = static_cast<PluginView*>(pluginWidget);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
