Diff
Modified: trunk/LayoutTests/ChangeLog (199201 => 199202)
--- trunk/LayoutTests/ChangeLog 2016-04-07 23:28:08 UTC (rev 199201)
+++ trunk/LayoutTests/ChangeLog 2016-04-07 23:38:32 UTC (rev 199202)
@@ -1,3 +1,16 @@
+2016-04-07 Jiewen Tan <[email protected]>
+
+ Unreviewed, rolling out r199199.
+
+ Revision breaks layout tests
+
+ Reverted changeset:
+
+ "fast/loader/opaque-base-url.html crashing during mac and ios
+ debug tests"
+ https://bugs.webkit.org/show_bug.cgi?id=156179
+ http://trac.webkit.org/changeset/199199
+
2016-04-07 Simon Fraser <[email protected]>
Make it possible to test effect of view exposed rect on tiled backing
Modified: trunk/LayoutTests/TestExpectations (199201 => 199202)
--- trunk/LayoutTests/TestExpectations 2016-04-07 23:28:08 UTC (rev 199201)
+++ trunk/LayoutTests/TestExpectations 2016-04-07 23:38:32 UTC (rev 199202)
@@ -905,6 +905,8 @@
imported/blink/fast/multicol/outlines-at-column-boundaries.html [ ImageOnlyFailure ]
fast/multicol/multicol-with-child-renderLayer-for-input.html [ ImageOnlyFailure ]
+webkit.org/b/156179 [ Debug ] fast/loader/opaque-base-url.html [ Skip ]
+
# Assertion failure in MessagePort::contextDestroyed, usually attributed to later tests
webkit.org/b/94458 http/tests/security/MessagePort/event-listener-context.html [ Skip ]
Deleted: trunk/LayoutTests/fast/url/data-uri-based-urls-expected.txt (199201 => 199202)
--- trunk/LayoutTests/fast/url/data-uri-based-urls-expected.txt 2016-04-07 23:28:08 UTC (rev 199201)
+++ trunk/LayoutTests/fast/url/data-uri-based-urls-expected.txt 2016-04-07 23:38:32 UTC (rev 199202)
@@ -1,20 +0,0 @@
-Test passes if i) the first iframe which includes a relative URL prints about:blank, ii) the second one which includes an absolute URL prints http://www.example.com, and iii) the third one which includes a fragment does not print about:blank
-
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-about:blank
-
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-http://www.example.com/
-
-
---------
-Frame: '<!--framePath //<!--frame2-->-->'
---------
-data:text/html,
Deleted: trunk/LayoutTests/fast/url/data-uri-based-urls.html (199201 => 199202)
--- trunk/LayoutTests/fast/url/data-uri-based-urls.html 2016-04-07 23:28:08 UTC (rev 199201)
+++ trunk/LayoutTests/fast/url/data-uri-based-urls.html 2016-04-07 23:38:32 UTC (rev 199202)
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpChildFramesAsText();
- }
-</script>
-</head>
-<body>
-<p>Test passes if i) the first iframe which includes a relative URL prints about:blank, ii) the second one which includes an absolute URL prints http://www.example.com, and iii) the third one which includes a fragment does not print about:blank</p>
-
-<iframe src=''></iframe>
-
-<iframe src=''></iframe>
-
-<iframe src=''></iframe>
-</body>
-</html>
Modified: trunk/LayoutTests/fast/url/relative-expected.txt (199201 => 199202)
--- trunk/LayoutTests/fast/url/relative-expected.txt 2016-04-07 23:28:08 UTC (rev 199201)
+++ trunk/LayoutTests/fast/url/relative-expected.txt 2016-04-07 23:38:32 UTC (rev 199202)
@@ -38,7 +38,7 @@
PASS canonicalize('#ref') is 'http://host/a#ref'
PASS canonicalize('#') is 'http://host/a#'
PASS canonicalize('#bye') is 'http://host/a?foo=bar#bye'
-FAIL canonicalize('baz.html') should be . Was about:blank.
+FAIL canonicalize('baz.html') should be . Was baz.html.
PASS canonicalize('data:baz') is 'data:baz'
PASS canonicalize('data:/base') is 'data:/base'
PASS canonicalize('http://host/') is 'http://host/'
@@ -46,7 +46,7 @@
PASS canonicalize('./asd:fgh') is 'http://foo/asd:fgh'
PASS canonicalize(':foo') is 'http://foo/:foo'
PASS canonicalize(' hello world') is 'http://foo/hello%20world'
-FAIL canonicalize(':foo') should be . Was about:blank.
+FAIL canonicalize(':foo') should be . Was :foo.
PASS canonicalize(';foo') is 'http://host/;foo'
PASS canonicalize(';foo') is 'http://host/;foo'
PASS canonicalize(';/../bar') is 'http://host/bar'
Modified: trunk/Source/WebCore/ChangeLog (199201 => 199202)
--- trunk/Source/WebCore/ChangeLog 2016-04-07 23:28:08 UTC (rev 199201)
+++ trunk/Source/WebCore/ChangeLog 2016-04-07 23:38:32 UTC (rev 199202)
@@ -1,3 +1,16 @@
+2016-04-07 Jiewen Tan <[email protected]>
+
+ Unreviewed, rolling out r199199.
+
+ Revision breaks layout tests
+
+ Reverted changeset:
+
+ "fast/loader/opaque-base-url.html crashing during mac and ios
+ debug tests"
+ https://bugs.webkit.org/show_bug.cgi?id=156179
+ http://trac.webkit.org/changeset/199199
+
2016-04-07 Simon Fraser <[email protected]>
Make it possible to test effect of view exposed rect on tiled backing
Modified: trunk/Source/WebCore/platform/URL.cpp (199201 => 199202)
--- trunk/Source/WebCore/platform/URL.cpp 2016-04-07 23:28:08 UTC (rev 199201)
+++ trunk/Source/WebCore/platform/URL.cpp 2016-04-07 23:38:32 UTC (rev 199202)
@@ -491,8 +491,6 @@
str = strBuffer.data();
} else {
if (!encodeRelativeString(rel, encoding, strBuffer)) {
- // FIXME: Instead of assigning the m_string to blankURL(), we should
- // figure out a proper way to preserve the original malformed URL strings.
m_string = blankURL();
invalidate();
return;
@@ -544,9 +542,7 @@
appendASCII(base.m_string.left(base.m_queryEnd), str, len, parseBuffer);
parse(parseBuffer.data(), &relative);
} else {
- // FIXME: Instead of assigning the m_string to blankURL(), we should
- // figure out a proper way to preserve the original malformed URL strings.
- m_string = blankURL();
+ m_string = relative;
invalidate();
}
return;
