Title: [199996] releases/WebKitGTK/webkit-2.12
- Revision
- 199996
- Author
- [email protected]
- Date
- 2016-04-25 05:17:18 -0700 (Mon, 25 Apr 2016)
Log Message
Merge r199313 - fast/loader/opaque-base-url.html crashing during mac and ios debug tests
https://bugs.webkit.org/show_bug.cgi?id=156179
<rdar://problem/25507719>
Reviewed by Ryosuke Niwa.
Source/WebCore:
Navigate to about:blank if the provided src of an iframe/frame cannot be
resolved to a valid URL.
Test: fast/loader/iframe-src-invalid-url.html
* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::requestFrame):
LayoutTests:
* fast/loader/iframe-src-invalid-url-expected.txt: Added.
* fast/loader/iframe-src-invalid-url.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (199995 => 199996)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-25 12:14:41 UTC (rev 199995)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-25 12:17:18 UTC (rev 199996)
@@ -1,3 +1,14 @@
+2016-04-11 Jiewen Tan <[email protected]>
+
+ fast/loader/opaque-base-url.html crashing during mac and ios debug tests
+ https://bugs.webkit.org/show_bug.cgi?id=156179
+ <rdar://problem/25507719>
+
+ Reviewed by Ryosuke Niwa.
+
+ * fast/loader/iframe-src-invalid-url-expected.txt: Added.
+ * fast/loader/iframe-src-invalid-url.html: Added.
+
2016-04-11 Zalan Bujtas <[email protected]>
REGRESSION (r193857): Text selection causes text to disappear.
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/loader/iframe-src-invalid-url-expected.txt (0 => 199996)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/loader/iframe-src-invalid-url-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/loader/iframe-src-invalid-url-expected.txt 2016-04-25 12:17:18 UTC (rev 199996)
@@ -0,0 +1,13 @@
+Test passes if the first child frame prints about:blank.
+
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+about:blank
+
+--------
+Frame: 'iframe'
+--------
+
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/loader/iframe-src-invalid-url.html (0 => 199996)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/loader/iframe-src-invalid-url.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/loader/iframe-src-invalid-url.html 2016-04-25 12:17:18 UTC (rev 199996)
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpChildFramesAsText();
+ }
+</script>
+</head>
+<body>
+ <p>Test passes if the first child frame prints about:blank.</p>
+ <iframe src=""
+ <iframe id='iframe' src=''></iframe>
+ <script>document.write(document.getElementById('iframe').contentWindow.location.href);</script>"></iframe>
+</body>
+</html>
\ No newline at end of file
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199995 => 199996)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 12:14:41 UTC (rev 199995)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 12:17:18 UTC (rev 199996)
@@ -1,3 +1,19 @@
+2016-04-11 Jiewen Tan <[email protected]>
+
+ fast/loader/opaque-base-url.html crashing during mac and ios debug tests
+ https://bugs.webkit.org/show_bug.cgi?id=156179
+ <rdar://problem/25507719>
+
+ Reviewed by Ryosuke Niwa.
+
+ Navigate to about:blank if the provided src of an iframe/frame cannot be
+ resolved to a valid URL.
+
+ Test: fast/loader/iframe-src-invalid-url.html
+
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::requestFrame):
+
2016-04-11 Zalan Bujtas <[email protected]>
REGRESSION (r193857): Text selection causes text to disappear.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/loader/SubframeLoader.cpp (199995 => 199996)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/loader/SubframeLoader.cpp 2016-04-25 12:14:41 UTC (rev 199995)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/loader/SubframeLoader.cpp 2016-04-25 12:17:18 UTC (rev 199996)
@@ -84,6 +84,9 @@
} else
url = ""
+ if (!url.isValid())
+ url = ""
+
Frame* frame = loadOrRedirectSubframe(ownerElement, url, frameName, lockHistory, lockBackForwardList);
if (!frame)
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
