Title: [163599] trunk
- Revision
- 163599
- Author
- [email protected]
- Date
- 2014-02-06 18:18:32 -0800 (Thu, 06 Feb 2014)
Log Message
loadSubframe can return null in SubframeLoader::loadOrRedirectSubframe
https://bugs.webkit.org/show_bug.cgi?id=128344
Reviewed by Ryosuke Niwa.
Source/WebCore:
* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::loadOrRedirectSubframe):
LayoutTests:
* TestExpectations: Unskipped tests that were previously crashing
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (163598 => 163599)
--- trunk/LayoutTests/ChangeLog 2014-02-07 02:16:08 UTC (rev 163598)
+++ trunk/LayoutTests/ChangeLog 2014-02-07 02:18:32 UTC (rev 163599)
@@ -1,3 +1,12 @@
+2014-02-06 Jeffrey Pfau <[email protected]>
+
+ loadSubframe can return null in SubframeLoader::loadOrRedirectSubframe
+ https://bugs.webkit.org/show_bug.cgi?id=128344
+
+ Reviewed by Ryosuke Niwa.
+
+ * TestExpectations: Unskipped tests that were previously crashing
+
2014-02-06 Zoltan Horvath <[email protected]>
[CSS Shapes] Rounded Insets Let Content Overlap Shape
Modified: trunk/LayoutTests/TestExpectations (163598 => 163599)
--- trunk/LayoutTests/TestExpectations 2014-02-07 02:16:08 UTC (rev 163598)
+++ trunk/LayoutTests/TestExpectations 2014-02-07 02:18:32 UTC (rev 163599)
@@ -98,7 +98,3 @@
fast/harness/sample-fail-mismatch-reftest.html [ WontFix ImageOnlyFailure ]
webkit.org/b/127697 fast/writing-mode/ruby-text-logical-left.html [ Skip ]
-
-# These will be fixed soon
-[ Debug ] fast/parser/adoption-agency-crash-01.html [ Crash ]
-[ Debug ] fast/parser/adoption-agency-crash-03.html [ Crash ]
Modified: trunk/Source/WebCore/ChangeLog (163598 => 163599)
--- trunk/Source/WebCore/ChangeLog 2014-02-07 02:16:08 UTC (rev 163598)
+++ trunk/Source/WebCore/ChangeLog 2014-02-07 02:18:32 UTC (rev 163599)
@@ -1,3 +1,13 @@
+2014-02-06 Jeffrey Pfau <[email protected]>
+
+ loadSubframe can return null in SubframeLoader::loadOrRedirectSubframe
+ https://bugs.webkit.org/show_bug.cgi?id=128344
+
+ Reviewed by Ryosuke Niwa.
+
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::loadOrRedirectSubframe):
+
2014-02-06 Andreas Kling <[email protected]>
Use child iterator in HTMLDetailsElement::findMainSummary().
Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (163598 => 163599)
--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2014-02-07 02:16:08 UTC (rev 163598)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2014-02-07 02:18:32 UTC (rev 163599)
@@ -328,6 +328,9 @@
else
frame = loadSubframe(ownerElement, url, frameName, m_frame.loader().outgoingReferrer());
+ if (!frame)
+ return nullptr;
+
ASSERT(ownerElement.contentFrame() == frame || !ownerElement.contentFrame());
return ownerElement.contentFrame();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
