Title: [101232] trunk
- Revision
- 101232
- Author
- [email protected]
- Date
- 2011-11-28 01:11:45 -0800 (Mon, 28 Nov 2011)
Log Message
Source/WebKit2: Reviewed by Simon Hausmann.
[WK2] fast/frames/iframe-plugin-load-remove-document-crash.html crashes
https://bugs.webkit.org/show_bug.cgi?id=63321
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::manualStreamDidFail): Don't assert that m_manualStream
is not null since it is not guaranteed but instead handle the case when it is null
with early return.
LayoutTests: [WK2] fast/frames/iframe-plugin-load-remove-document-crash.html crashes
https://bugs.webkit.org/show_bug.cgi?id=63321
Reviewed by Simon Hausmann.
Unskip the test.
* platform/qt-wk2/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (101231 => 101232)
--- trunk/LayoutTests/ChangeLog 2011-11-28 09:02:28 UTC (rev 101231)
+++ trunk/LayoutTests/ChangeLog 2011-11-28 09:11:45 UTC (rev 101232)
@@ -1,3 +1,14 @@
+2011-11-28 Balazs Kelemen <[email protected]>
+
+ [WK2] fast/frames/iframe-plugin-load-remove-document-crash.html crashes
+ https://bugs.webkit.org/show_bug.cgi?id=63321
+
+ Reviewed by Simon Hausmann.
+
+ Unskip the test.
+
+ * platform/qt-wk2/Skipped:
+
2011-11-27 Hayato Ito <[email protected]>
Chromium rebaselines for r101202.
Modified: trunk/LayoutTests/platform/qt-wk2/Skipped (101231 => 101232)
--- trunk/LayoutTests/platform/qt-wk2/Skipped 2011-11-28 09:02:28 UTC (rev 101231)
+++ trunk/LayoutTests/platform/qt-wk2/Skipped 2011-11-28 09:11:45 UTC (rev 101232)
@@ -760,10 +760,6 @@
svg/W3C-SVG-1.1-SE/painting-marker-07-f.svg
svg/W3C-SVG-1.1-SE/struct-use-14-f.svg
-# [Qt][WK2] fast/frames/iframe-plugin-load-remove-document-crash.html crashes
-# https://bugs.webkit.org/show_bug.cgi?id=63321
-fast/frames/iframe-plugin-load-remove-document-crash.html
-
# Qt specific results committed in r89901, but fail on Qt-WK2 platform
svg/W3C-SVG-1.1-SE/interact-pointer-03-t.svg
svg/W3C-SVG-1.1-SE/linking-uri-01-b.svg
Modified: trunk/Source/WebKit2/ChangeLog (101231 => 101232)
--- trunk/Source/WebKit2/ChangeLog 2011-11-28 09:02:28 UTC (rev 101231)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-28 09:11:45 UTC (rev 101232)
@@ -1,3 +1,15 @@
+2011-11-28 Balazs Kelemen <[email protected]>
+
+ Reviewed by Simon Hausmann.
+
+ [WK2] fast/frames/iframe-plugin-load-remove-document-crash.html crashes
+ https://bugs.webkit.org/show_bug.cgi?id=63321
+
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::manualStreamDidFail): Don't assert that m_manualStream
+ is not null since it is not guaranteed but instead handle the case when it is null
+ with early return.
+
2011-11-27 Zeno Albisser <[email protected]>
[Qt][WK2] MiniBrowser stops displaying content after surfing a few pages.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (101231 => 101232)
--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2011-11-28 09:02:28 UTC (rev 101231)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2011-11-28 09:11:45 UTC (rev 101232)
@@ -817,8 +817,9 @@
{
ASSERT(m_isStarted);
ASSERT(m_loadManually);
- ASSERT(m_manualStream);
+ if (!m_manualStream)
+ return;
m_manualStream->didFail(wasCancelled);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
