Diff
Modified: trunk/LayoutTests/ChangeLog (199751 => 199752)
--- trunk/LayoutTests/ChangeLog 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/LayoutTests/ChangeLog 2016-04-20 01:33:34 UTC (rev 199752)
@@ -1,3 +1,22 @@
+2016-04-19 Brent Fulgham <[email protected]>
+
+ Remove remaining bits of dynamic <link> rel='icon' loading
+ https://bugs.webkit.org/show_bug.cgi?id=156727
+
+ Reviewed by Darin Adler.
+
+ Rename 'test-link-rel-icon-beforeload.html' to 'test-link-rel-subresource-beforeload.html'.
+
+ * fast/dom/icon-url-property-expected.txt: Removed.
+ * fast/dom/icon-url-property.html: Removed.
+ * platform/gtk/TestExpectations: Remove references to deleted tests.
+ * platform/ios-simulator/TestExpectations: Ditto.
+ * platform/wk2/TestExpectations: Ditto.
+ * webarchive/test-link-rel-icon-beforeload-expected.webarchive: Removed.
+ * webarchive/test-link-rel-icon-beforeload.html: Removed.
+ * webarchive/test-link-rel-subresource-beforeload-expected.webarchive: Copied from LayoutTests/webarchive/test-link-rel-icon-beforeload-expected.webarchive.
+ * webarchive/test-link-rel-subresource-beforeload.html: Copied from LayoutTests/webarchive/test-link-rel-icon-beforeload.html.
+
2016-04-19 Chris Dumez <[email protected]>
AudioBufferSourceNode.buffer should be nullable
Deleted: trunk/LayoutTests/fast/dom/icon-url-property-expected.txt (199751 => 199752)
--- trunk/LayoutTests/fast/dom/icon-url-property-expected.txt 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/LayoutTests/fast/dom/icon-url-property-expected.txt 2016-04-20 01:33:34 UTC (rev 199752)
@@ -1,7 +0,0 @@
-main frame - didChangeIcons
-main frame - didChangeIcons
-main frame - didChangeIcons
-Original iconURL is: http://test.com/oldfavicon.ico
-Setting new icon URL to: http://test.com/newfavicon.ico
-New iconURL is: http://test.com/newfavicon.ico
-PASS - URL list matches expected
Deleted: trunk/LayoutTests/fast/dom/icon-url-property.html (199751 => 199752)
--- trunk/LayoutTests/fast/dom/icon-url-property.html 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/LayoutTests/fast/dom/icon-url-property.html 2016-04-20 01:33:34 UTC (rev 199752)
@@ -1,75 +0,0 @@
-<html>
-<head>
-<title>Original Title</title>
-<link rel="shortcut icon" type="image/x-icon" href=""
-<script>
-function debugOutput(str) {
- text = document.createTextNode(str);
- debugDiv = document.getElementById('debugDiv');
- div = document.createElement ('div');
- div.appendChild(text);
- debugDiv.appendChild(div);
-}
-
-function createFavIconElement(iconURL) {
- var link = document.createElement("link");
- link.type = "image/x-icon";
- link.rel = "shortcut icon";
- link.href = ""
- return link;
-}
-
-function getHeadElement() {
- return document.getElementsByTagName("head")[0];
-}
-
-function setFavIcon(iconURL) {
- var docHead = getHeadElement();
- var links = docHead.getElementsByTagName("link");
- for (var i = 0; i < links.length; ++i) {
- var link = links[i];
- if (link.type=="image/x-icon" && link.rel=="shortcut icon") {
- docHead.removeChild(link);
- break; // Assuming only one match at most.
- }
- }
- docHead.appendChild(createFavIconElement(iconURL));
-}
-
-function runTests() {
- if (window.testRunner) {
- testRunner.dumpAsText();
- if (testRunner.dumpIconChanges)
- testRunner.dumpIconChanges();
- }
-
- iconURL = document.getElementsByTagName("head")[0].getElementsByTagName("link")[0].href;
- debugOutput ('Original iconURL is: ' + iconURL);
- newURL = 'http://test.com/newfavicon.ico';
- debugOutput ('Setting new icon URL to: ' + newURL);
- setFavIcon(newURL);
- iconURL = document.getElementsByTagName("head")[0].getElementsByTagName("link")[0].href;
-
- debugOutput ('New iconURL is: ' + iconURL);
-
- // check that the URL list in the document is as we expect
- var expectedURLs = "http://test.com/newfavicon.ico";
- var iconURLs = window.internals.shortcutIconURLs();
- if (expectedURLs == iconURLs[0])
- debugOutput('PASS - URL list matches expected');
- else
- debugOutput('FAIL - URL list does not match expected');
-
- // Add some more fav icons to verify that didChangeIcons gets called.
- var docHead = getHeadElement();
- docHead.insertBefore(createFavIconElement("http://example.org/icon1.ico"), docHead.firstChild);
- docHead.appendChild(createFavIconElement("http://example.org/icon2.ico"));
-}
-
-</script>
-</head>
-<body _onload_='runTests();'>
-<div id='debugDiv'>
-</div>
-</body>
-</html>
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (199751 => 199752)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2016-04-20 01:33:34 UTC (rev 199752)
@@ -2076,8 +2076,6 @@
webkit.org/b/99893 svg/animations/mozilla/animateMotion-mpath-targetChange-1.svg [ ImageOnlyFailure Pass ]
-webkit.org/b/112705 fast/dom/icon-url-property.html [ Failure ]
-
webkit.org/b/113772 http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_iframe_self_navigation.html [ Failure ]
webkit.org/b/113772 http/tests/w3c/webperf/submission/Google/resource-timing/html/test_resource_cached.html [ Failure ]
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (199751 => 199752)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-04-20 01:33:34 UTC (rev 199752)
@@ -1564,7 +1564,6 @@
fast/dom/custom/lifecycle-ready-parser-script.html [ Failure ]
fast/dom/horizontal-scrollbar-in-rtl.html [ Failure ]
fast/dom/horizontal-scrollbar-when-dir-change.html [ Failure ]
-fast/dom/icon-url-property.html [ Failure ]
fast/dom/jsDevicePixelRatio.html [ Failure ]
fast/dom/navigator-detached-no-crash.html [ Failure ]
fast/dom/scroll-reveal-left-overflow.html [ Failure ]
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (199751 => 199752)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2016-04-20 01:33:34 UTC (rev 199752)
@@ -45,10 +45,6 @@
webkit.org/b/156612 http/tests/security/contentSecurityPolicy/embed-redirect-blocked3.html [ Failure ]
webkit.org/b/156612 http/tests/security/contentSecurityPolicy/object-redirect-blocked3.html [ Failure ]
-# WebKitTestRunner needs to implement testRunner.dumpIconChanges().
-webkit.org/b/44046 http/tests/security/contentSecurityPolicy/icon-allowed.html
-webkit.org/b/44046 http/tests/security/contentSecurityPolicy/icon-blocked.html
-
# AX tests that require hit testing do not work in WK2.
webkit.org/b/71298 accessibility/loading-iframe-updates-axtree.html
webkit.org/b/71298 accessibility/mac/html-slider-indicator.html
@@ -72,9 +68,6 @@
webkit.org/b/42197 fast/harness/override-preferences-2.html [ Failure ]
webkit.org/b/42197 fast/text/zero-font-size.html [ Pass ]
-# setIconDatabaseEnabled not implemented in WebKitTestRunner.
-webkit.org/b/115809 webarchive/test-link-rel-icon-beforeload.html [ Skip ]
-
webkit.org/b/82665 http/tests/webarchive/test-css-url-encoding.html [ Skip ]
webkit.org/b/82665 http/tests/webarchive/test-css-url-encoding-shift-jis.html [ Skip ]
webkit.org/b/82665 http/tests/webarchive/test-css-url-encoding-utf-8.html [ Skip ]
Deleted: trunk/LayoutTests/webarchive/test-link-rel-icon-beforeload-expected.webarchive (199751 => 199752)
--- trunk/LayoutTests/webarchive/test-link-rel-icon-beforeload-expected.webarchive 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/LayoutTests/webarchive/test-link-rel-icon-beforeload-expected.webarchive 2016-04-20 01:33:34 UTC (rev 199752)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>WebMainResource</key>
- <dict>
- <key>WebResourceData</key>
- <string><html><head>
-<script>
-function runTest()
-{
- if (window.testRunner) {
- testRunner.setIconDatabaseEnabled(true);
- testRunner.dumpDOMAsWebArchive();
- testRunner.queueReload();
- }
-}
-</script>
-</head>
-<body _onload_="runTest()">
-<div id="console"><div style="font-family: monospace; color: green;">PASS</div></div>
-<script>
-function print(message, color)
-{
- var paragraph = document.createElement("div");
- paragraph.appendChild(document.createTextNode(message));
- paragraph.style.fontFamily = "monospace";
- if (color)
- paragraph.style.color = color;
- document.getElementById("console").appendChild(paragraph);
-}
-</script>
-<p>This test should have a green 'PASS' just above this line. If it doesn't, you failed.
-<link rel="icon" _onbeforeload_="print('PASS','green');return false" href="" type="image/x-icon">
-
-
-</p></body></html></string>
- <key>WebResourceFrameName</key>
- <string></string>
- <key>WebResourceMIMEType</key>
- <string>text/html</string>
- <key>WebResourceTextEncodingName</key>
- <string>UTF-8</string>
- <key>WebResourceURL</key>
- <string>file:///LayoutTests/webarchive/test-link-rel-icon-beforeload.html</string>
- </dict>
-</dict>
-</plist>
Deleted: trunk/LayoutTests/webarchive/test-link-rel-icon-beforeload.html (199751 => 199752)
--- trunk/LayoutTests/webarchive/test-link-rel-icon-beforeload.html 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/LayoutTests/webarchive/test-link-rel-icon-beforeload.html 2016-04-20 01:33:34 UTC (rev 199752)
@@ -1,30 +0,0 @@
-<html>
-<head>
-<script>
-function runTest()
-{
- if (window.testRunner) {
- testRunner.setIconDatabaseEnabled(true);
- testRunner.dumpDOMAsWebArchive();
- testRunner.queueReload();
- }
-}
-</script>
-</head>
-<body _onload_="runTest()">
-<div id="console"></div>
-<script>
-function print(message, color)
-{
- var paragraph = document.createElement("div");
- paragraph.appendChild(document.createTextNode(message));
- paragraph.style.fontFamily = "monospace";
- if (color)
- paragraph.style.color = color;
- document.getElementById("console").appendChild(paragraph);
-}
-</script>
-<p>This test should have a green 'PASS' just above this line. If it doesn't, you failed.
-<link rel="icon" _onbeforeload_="print('PASS','green');return false" href="" type="image/x-icon">
-</body>
-</html>
Copied: trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload-expected.webarchive (from rev 199751, trunk/LayoutTests/webarchive/test-link-rel-icon-beforeload-expected.webarchive) (0 => 199752)
--- trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload-expected.webarchive (rev 0)
+++ trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload-expected.webarchive 2016-04-20 01:33:34 UTC (rev 199752)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>WebMainResource</key>
+ <dict>
+ <key>WebResourceData</key>
+ <string><html><head>
+<script>
+function runTest()
+{
+ if (window.testRunner) {
+ testRunner.dumpDOMAsWebArchive();
+ testRunner.queueReload();
+ }
+}
+</script>
+</head>
+<body _onload_="runTest()">
+<div id="console"><div style="font-family: monospace; color: green;">PASS</div></div>
+<script>
+function print(message, color)
+{
+ var paragraph = document.createElement("div");
+ paragraph.appendChild(document.createTextNode(message));
+ paragraph.style.fontFamily = "monospace";
+ if (color)
+ paragraph.style.color = color;
+ document.getElementById("console").appendChild(paragraph);
+}
+</script>
+<p>This test should have a green 'PASS' just above this line. If it doesn't, you failed.
+<link rel="subresource" _onbeforeload_="print('PASS','green');return false" href="" type="image/x-icon">
+
+
+</p></body></html></string>
+ <key>WebResourceFrameName</key>
+ <string></string>
+ <key>WebResourceMIMEType</key>
+ <string>text/html</string>
+ <key>WebResourceTextEncodingName</key>
+ <string>UTF-8</string>
+ <key>WebResourceURL</key>
+ <string>file:///LayoutTests/webarchive/test-link-rel-subresource-beforeload.html</string>
+ </dict>
+</dict>
+</plist>
Copied: trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload.html (from rev 199751, trunk/LayoutTests/webarchive/test-link-rel-icon-beforeload.html) (0 => 199752)
--- trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload.html (rev 0)
+++ trunk/LayoutTests/webarchive/test-link-rel-subresource-beforeload.html 2016-04-20 01:33:34 UTC (rev 199752)
@@ -0,0 +1,29 @@
+<html>
+<head>
+<script>
+function runTest()
+{
+ if (window.testRunner) {
+ testRunner.dumpDOMAsWebArchive();
+ testRunner.queueReload();
+ }
+}
+</script>
+</head>
+<body _onload_="runTest()">
+<div id="console"></div>
+<script>
+function print(message, color)
+{
+ var paragraph = document.createElement("div");
+ paragraph.appendChild(document.createTextNode(message));
+ paragraph.style.fontFamily = "monospace";
+ if (color)
+ paragraph.style.color = color;
+ document.getElementById("console").appendChild(paragraph);
+}
+</script>
+<p>This test should have a green 'PASS' just above this line. If it doesn't, you failed.
+<link rel="subresource" _onbeforeload_="print('PASS','green');return false" href="" type="image/x-icon">
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (199751 => 199752)
--- trunk/Source/WebCore/ChangeLog 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/Source/WebCore/ChangeLog 2016-04-20 01:33:34 UTC (rev 199752)
@@ -1,3 +1,22 @@
+2016-04-19 Brent Fulgham <[email protected]>
+
+ Remove remaining bits of dynamic <link> rel='icon' loading
+ https://bugs.webkit.org/show_bug.cgi?id=156727
+
+ Reviewed by Darin Adler.
+
+ Don't call 'shouldLoadLink' for 'icon' link types. It performs no
+ useful checks for 'icon' types, and emits the non-standard
+ 'onbeforeload' event.
+
+ This work finishes up https://webkit.org/b/153151, where we removed
+ FrameLoaderClient::dispatchDidChangeIcons() and related code.
+
+ Test: webarchive/test-link-rel-subresource-beforeload.html
+
+ * loader/LinkLoader.cpp:
+ (WebCore::LinkLoader::loadLink): Remove unneeded call to 'shouldLoadLink'.
+
2016-04-19 Chris Dumez <[email protected]>
AudioBufferSourceNode.buffer should be nullable
Modified: trunk/Source/WebCore/loader/LinkLoader.cpp (199751 => 199752)
--- trunk/Source/WebCore/loader/LinkLoader.cpp 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/Source/WebCore/loader/LinkLoader.cpp 2016-04-20 01:33:34 UTC (rev 199752)
@@ -137,12 +137,6 @@
bool LinkLoader::loadLink(const LinkRelAttribute& relAttribute, const URL& href, const String& as, const String& crossOrigin, Document& document)
{
- // We'll record this URL per document, even if we later only use it in top level frames
- if (relAttribute.iconType != InvalidIcon && href.isValid() && !href.isEmpty()) {
- if (!m_client.shouldLoadLink())
- return false;
- }
-
if (relAttribute.isDNSPrefetch) {
Settings* settings = document.settings();
// FIXME: The href attribute of the link element can be in "//hostname" form, and we shouldn't attempt
Modified: trunk/Tools/ChangeLog (199751 => 199752)
--- trunk/Tools/ChangeLog 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/Tools/ChangeLog 2016-04-20 01:33:34 UTC (rev 199752)
@@ -1,3 +1,19 @@
+2016-04-19 Brent Fulgham <[email protected]>
+
+ Remove remaining bits of dynamic <link> rel='icon' loading
+ https://bugs.webkit.org/show_bug.cgi?id=156727
+
+ Reviewed by Darin Adler.
+
+ Remove unused test infrastructure. This code never existed in WebKit2
+ testing since was only used on Windows.
+
+ * DumpRenderTree/TestRunner.cpp:
+ (dumpIconChangesCallback): Deleted.
+ * DumpRenderTree/TestRunner.h:
+ (TestRunner::dumpIconChanges): Deleted.
+ (TestRunner::setDumpIconChanges): Deleted.
+
2016-04-19 Keith Miller <[email protected]>
ObjcInstance::stringValue should not call NSObject's description method
Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (199751 => 199752)
--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2016-04-20 01:33:34 UTC (rev 199752)
@@ -81,7 +81,6 @@
, m_dumpSourceAsWebArchive(false)
, m_dumpStatusCallbacks(false)
, m_dumpTitleChanges(false)
- , m_dumpIconChanges(false)
, m_dumpVisitedLinksCallback(false)
, m_dumpWillCacheResponse(false)
, m_generatePixelResults(true)
@@ -263,13 +262,6 @@
return JSValueMakeUndefined(context);
}
-static JSValueRef dumpIconChangesCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
-{
- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
- controller->setDumpIconChanges(true);
- return JSValueMakeUndefined(context);
-}
-
static JSValueRef dumpWillCacheResponseCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
@@ -2064,7 +2056,6 @@
{ "dumpSourceAsWebArchive", dumpSourceAsWebArchiveCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "dumpStatusCallbacks", dumpStatusCallbacksCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "dumpTitleChanges", dumpTitleChangesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
- { "dumpIconChanges", dumpIconChangesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "dumpWillCacheResponse", dumpWillCacheResponseCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "encodeHostName", encodeHostNameCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "evaluateInWebInspector", evaluateInWebInspectorCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
Modified: trunk/Tools/DumpRenderTree/TestRunner.h (199751 => 199752)
--- trunk/Tools/DumpRenderTree/TestRunner.h 2016-04-20 01:30:11 UTC (rev 199751)
+++ trunk/Tools/DumpRenderTree/TestRunner.h 2016-04-20 01:33:34 UTC (rev 199752)
@@ -210,9 +210,6 @@
bool dumpTitleChanges() const { return m_dumpTitleChanges; }
void setDumpTitleChanges(bool dumpTitleChanges) { m_dumpTitleChanges = dumpTitleChanges; }
- bool dumpIconChanges() const { return m_dumpIconChanges; }
- void setDumpIconChanges(bool dumpIconChanges) { m_dumpIconChanges = dumpIconChanges; }
-
bool dumpVisitedLinksCallback() const { return m_dumpVisitedLinksCallback; }
void setDumpVisitedLinksCallback(bool dumpVisitedLinksCallback) { m_dumpVisitedLinksCallback = dumpVisitedLinksCallback; }
@@ -386,7 +383,6 @@
bool m_dumpSourceAsWebArchive;
bool m_dumpStatusCallbacks;
bool m_dumpTitleChanges;
- bool m_dumpIconChanges;
bool m_dumpVisitedLinksCallback;
bool m_dumpWillCacheResponse;
bool m_generatePixelResults;
