Title: [165147] branches/safari-537.75-branch
Diff
Modified: branches/safari-537.75-branch/LayoutTests/ChangeLog (165146 => 165147)
--- branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-03-06 01:20:05 UTC (rev 165146)
+++ branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-03-06 01:21:23 UTC (rev 165147)
@@ -1,5 +1,18 @@
2014-03-05 Matthew Hanson <[email protected]>
+ Merge r163599.
+
+ 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-03-05 Matthew Hanson <[email protected]>
+
Merge r164170.
2014-02-15 Renata Hodovan <[email protected]>
Modified: branches/safari-537.75-branch/LayoutTests/TestExpectations (165146 => 165147)
--- branches/safari-537.75-branch/LayoutTests/TestExpectations 2014-03-06 01:20:05 UTC (rev 165146)
+++ branches/safari-537.75-branch/LayoutTests/TestExpectations 2014-03-06 01:21:23 UTC (rev 165147)
@@ -20,7 +20,3 @@
webkit.org/b/57700 mathml/presentation/row.xhtml [ Failure ]
webkit.org/b/57700 mathml/presentation/mo.xhtml [ Failure ]
-
-# These will be fixed soon
-[ Debug ] fast/parser/adoption-agency-crash-01.html [ Crash ]
-[ Debug ] fast/parser/adoption-agency-crash-03.html [ Crash ]
\ No newline at end of file
Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (165146 => 165147)
--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-06 01:20:05 UTC (rev 165146)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-06 01:21:23 UTC (rev 165147)
@@ -1,5 +1,19 @@
2014-03-05 Matthew Hanson <[email protected]>
+ Merge r163599.
+
+ 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-03-05 Matthew Hanson <[email protected]>
+
Merge r164170.
2014-02-15 Renata Hodovan <[email protected]>
Modified: branches/safari-537.75-branch/Source/WebCore/loader/SubframeLoader.cpp (165146 => 165147)
--- branches/safari-537.75-branch/Source/WebCore/loader/SubframeLoader.cpp 2014-03-06 01:20:05 UTC (rev 165146)
+++ branches/safari-537.75-branch/Source/WebCore/loader/SubframeLoader.cpp 2014-03-06 01:21:23 UTC (rev 165147)
@@ -341,6 +341,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
