Diff
Modified: trunk/ChangeLog (122204 => 122205)
--- trunk/ChangeLog 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/ChangeLog 2012-07-10 08:46:08 UTC (rev 122205)
@@ -1,3 +1,14 @@
+2012-07-10 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r122178.
+ http://trac.webkit.org/changeset/122178
+ https://bugs.webkit.org/show_bug.cgi?id=90857
+
+ browser tests, PrerenderBrowserTest.PrerenderFavicon and other
+ tests, started to fail (Requested by hayato on #webkit).
+
+ * Source/autotools/symbols.filter:
+
2012-07-09 Matt Falkenhagen <[email protected]>
Add ENABLE_DIALOG_ELEMENT and skeleton files
Modified: trunk/LayoutTests/ChangeLog (122204 => 122205)
--- trunk/LayoutTests/ChangeLog 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/LayoutTests/ChangeLog 2012-07-10 08:46:08 UTC (rev 122205)
@@ -1,3 +1,20 @@
+2012-07-10 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r122178.
+ http://trac.webkit.org/changeset/122178
+ https://bugs.webkit.org/show_bug.cgi?id=90857
+
+ browser tests, PrerenderBrowserTest.PrerenderFavicon and other
+ tests, started to fail (Requested by hayato on #webkit).
+
+ * fast/dom/icon-url-change-expected.txt: Removed.
+ * fast/dom/icon-url-change.html: Removed.
+ * fast/dom/icon-url-list-expected.txt: Removed.
+ * fast/dom/icon-url-list.html: Removed.
+ * fast/dom/icon-url-property-expected.txt:
+ * fast/dom/icon-url-property.html:
+ * platform/chromium/TestExpectations:
+
2012-07-10 Adam Barth <[email protected]>
LayoutTestController.dumpConfigurationForViewport should move to Internals
Deleted: trunk/LayoutTests/fast/dom/icon-url-change-expected.txt (122204 => 122205)
--- trunk/LayoutTests/fast/dom/icon-url-change-expected.txt 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/LayoutTests/fast/dom/icon-url-change-expected.txt 2012-07-10 08:46:08 UTC (rev 122205)
@@ -1,7 +0,0 @@
-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
-Setting icon URL back to: http://test.com/oldfavicon.ico
-Original iconURL is still: http://test.com/oldfavicon.ico
-PASS URL list matches expected
-
Deleted: trunk/LayoutTests/fast/dom/icon-url-change.html (122204 => 122205)
--- trunk/LayoutTests/fast/dom/icon-url-change.html 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/LayoutTests/fast/dom/icon-url-change.html 2012-07-10 08:46:08 UTC (rev 122205)
@@ -1,60 +0,0 @@
-<html>
-<head>
-<title>Original Title</title>
-<link rel="shortcut icon" type="image/x-icon" href=""
-<script src=""
-<script>
-
-function setFavIcon(iconURL) {
- var docHead = document.getElementsByTagName("head")[0];
- 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.
- }
- }
- var link = document.createElement("link");
- link.type = "image/x-icon";
- link.rel = "shortcut icon";
- link.href = ""
- docHead.appendChild(link);
-}
-
-function runTests() {
- if (window.testRunner)
- testRunner.dumpAsText();
-
- iconURL = document.getElementsByTagName("head")[0].getElementsByTagName("link")[0].href;
- debug('Original iconURL is: ' + iconURL);
-
- // change icon to new icon
- newURL = 'http://test.com/newfavicon.ico';
- debug('Setting new icon URL to: ' + newURL);
- setFavIcon(newURL);
- iconURL = document.getElementsByTagName("link")[0].href;
- debug('New iconURL is: ' + iconURL);
-
- // change icon back to old icon and ensure it changes properly
- oldURL = 'http://test.com/oldfavicon.ico';
- debug('Setting icon URL back to: ' + oldURL);
- setFavIcon(oldURL);
- iconURL = document.getElementsByTagName("link")[0].href;
- debug('Original iconURL is still: ' + iconURL);
-
- // check that the URL list in the document is as we expect
- var expectedURLs = "http://test.com/oldfavicon.ico";
- var iconURLs = window.internals.iconURLs(document);
- if (expectedURLs == iconURLs[0])
- testPassed('URL list matches expected');
- else
- testFailed('URL list does not match expected');
-}
-
-</script>
-</head>
-<body _onload_='runTests();'>
-</div>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/dom/icon-url-list-expected.txt (122204 => 122205)
--- trunk/LayoutTests/fast/dom/icon-url-list-expected.txt 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/LayoutTests/fast/dom/icon-url-list-expected.txt 2012-07-10 08:46:08 UTC (rev 122205)
@@ -1,5 +0,0 @@
-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-list.html (122204 => 122205)
--- trunk/LayoutTests/fast/dom/icon-url-list.html 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/LayoutTests/fast/dom/icon-url-list.html 2012-07-10 08:46:08 UTC (rev 122205)
@@ -1,63 +0,0 @@
-<html>
-<head>
-<title>Original Title</title>
-<link rel="shortcut icon" type="image/x-icon" href=""
-<link rel="shortcut icon" type="image/x-icon" href=""
-<link rel="shortcut icon" type="image/x-icon" href=""
-<script src=""
-<script>
-
-function setFavIcon(iconURL) {
- var docHead = document.getElementsByTagName("head")[0];
-
- // set up a new node for the new iconURL
- var newLink = document.createElement("link");
- newLink.type = "image/x-icon";
- newLink.rel = "shortcut icon";
- newLink.href = ""
-
- var links = docHead.getElementsByTagName("link");
- for (var i = 0; i < links.length; ++i) {
- var oldLink = links[i];
- if (oldLink.type=="image/x-icon" && oldLink.rel=="shortcut icon") {
- // if we find the child, replace it with the new node.
- docHead.replaceChild(newLink, oldLink);
- return; // Assuming only one match at most.
- }
- }
-
- // if we didn't find the icon URL link, add it now.
- docHead.appendChild(newLink);
-}
-
-function runTests() {
- if (window.testRunner)
- testRunner.dumpAsText();
-
- iconURL = document.getElementsByTagName("link")[0].href;
- debug('Original iconURL is: ' + iconURL);
-
- // change icon to new icon
- newURL = 'http://test.com/newfavicon.ico';
- debug('Setting new icon URL to: ' + newURL);
- setFavIcon(newURL);
- iconURL = document.getElementsByTagName("link")[0].href
- debug('New iconURL is: ' + iconURL);
-
- // check that the URL list in the document is as we expect
- var expectedURL0 = "http://test.com/barfavicon.ico";
- var expectedURL1 = "http://test.com/foofavicon.ico";
- var expectedURL2 = "http://test.com/newfavicon.ico";
- var iconURLs = window.internals.iconURLs(document);
- if (expectedURL0 == iconURLs[0] && expectedURL1 == iconURLs[1] && expectedURL2 == iconURLs[2])
- testPassed('URL list matches expected');
- else
- testFailed('URL list does not match expected');
-}
-
-</script>
-</head>
-<body _onload_='runTests();'>
-</div>
-</body>
-</html>
Modified: trunk/LayoutTests/fast/dom/icon-url-property-expected.txt (122204 => 122205)
--- trunk/LayoutTests/fast/dom/icon-url-property-expected.txt 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/LayoutTests/fast/dom/icon-url-property-expected.txt 2012-07-10 08:46:08 UTC (rev 122205)
@@ -1,4 +1,4 @@
+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
+Setting new icon URL to: http://test.com/newfavion.ico
+New iconURL is: http://test.com/newfavion.ico
Modified: trunk/LayoutTests/fast/dom/icon-url-property.html (122204 => 122205)
--- trunk/LayoutTests/fast/dom/icon-url-property.html 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/LayoutTests/fast/dom/icon-url-property.html 2012-07-10 08:46:08 UTC (rev 122205)
@@ -29,26 +29,18 @@
}
function runTests() {
- if (window.testRunner)
+ if (window.testRunner) {
testRunner.dumpAsText();
-
+ testRunner.dumpIconChanges();
+ }
iconURL = document.getElementsByTagName("head")[0].getElementsByTagName("link")[0].href;
debugOutput ('Original iconURL is: ' + iconURL);
- newURL = 'http://test.com/newfavicon.ico';
+ newURL = 'http://test.com/newfavion.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.iconURLs(document);
- if (expectedURLs == iconURLs[0])
- debugOutput('PASS - URL list matches expected');
- else
- debugOutput('FAIL - URL list does not match expected');
-
}
</script>
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (122204 => 122205)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-10 08:46:08 UTC (rev 122205)
@@ -1875,6 +1875,8 @@
// // Started failing at r58152
// BUGWK38038 : fast/url/file-http-base.html = TEXT
+BUGWK33812 SKIP : fast/dom/icon-url-property.html = PASS
+
// New layoutTestController function added at r57993
BUGCR42696 : http/tests/xmlhttprequest/cross-origin-authorization-with-embedder.html = TIMEOUT
Modified: trunk/Source/WebCore/ChangeLog (122204 => 122205)
--- trunk/Source/WebCore/ChangeLog 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/Source/WebCore/ChangeLog 2012-07-10 08:46:08 UTC (rev 122205)
@@ -1,3 +1,27 @@
+2012-07-10 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r122178.
+ http://trac.webkit.org/changeset/122178
+ https://bugs.webkit.org/show_bug.cgi?id=90857
+
+ browser tests, PrerenderBrowserTest.PrerenderFavicon and other
+ tests, started to fail (Requested by hayato on #webkit).
+
+ * WebCore.exp.in:
+ * dom/Document.cpp:
+ (WebCore::Document::iconURLs):
+ (WebCore::Document::addIconURL):
+ (WebCore::Document::setUseSecureKeyboardEntryWhenActive):
+ * dom/Document.h:
+ (Document):
+ * html/HTMLLinkElement.cpp:
+ * html/HTMLLinkElement.h:
+ (HTMLLinkElement):
+ * testing/Internals.cpp:
+ * testing/Internals.h:
+ (Internals):
+ * testing/Internals.idl:
+
2012-07-10 Adam Barth <[email protected]>
LayoutTestController.dumpConfigurationForViewport should move to Internals
Modified: trunk/Source/WebCore/WebCore.exp.in (122204 => 122205)
--- trunk/Source/WebCore/WebCore.exp.in 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-07-10 08:46:08 UTC (rev 122205)
@@ -831,7 +831,6 @@
__ZN7WebCore8Document27removeMediaCanStartListenerEPNS_21MediaCanStartListenerE
__ZN7WebCore8Document36updateLayoutIgnorePendingStylesheetsEv
__ZN7WebCore8Document4headEv
-__ZN7WebCore8Document8iconURLsEv
__ZN7WebCore8FormData6createEPKvm
__ZN7WebCore8FormDataD1Ev
__ZN7WebCore8Gradient12addColorStopEfRKNS_5ColorE
Modified: trunk/Source/WebCore/dom/Document.cpp (122204 => 122205)
--- trunk/Source/WebCore/dom/Document.cpp 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/Source/WebCore/dom/Document.cpp 2012-07-10 08:46:08 UTC (rev 122205)
@@ -4865,30 +4865,8 @@
return m_xpathEvaluator->evaluate(_expression_, contextNode, resolver, type, result, ec);
}
-const Vector<IconURL>& Document::iconURLs()
+const Vector<IconURL>& Document::iconURLs() const
{
- static const char* const iconMIMEType = "image/x-icon";
-
- m_iconURLs.clear();
-
- // Include any icons where type = link, rel = "shortcut icon".
- RefPtr<HTMLCollection> children = head()->children();
- unsigned int length = children->length();
- for (unsigned int i = 0; i < length; ++i) {
- Node* child = children->item(i);
- if (!child->hasTagName(linkTag))
- continue;
- HTMLLinkElement* linkElement = static_cast<HTMLLinkElement*>(child);
- if (!equalIgnoringCase(linkElement->type(), iconMIMEType) || linkElement->iconType() != Favicon)
- continue;
- if (linkElement->href().isEmpty())
- continue;
-
- // Put it at the front to ensure that icons seen later take precedence as required by the spec.
- IconURL newURL(linkElement->href(), linkElement->iconSizes(), linkElement->type(), linkElement->iconType());
- m_iconURLs.prepend(newURL);
- }
-
return m_iconURLs;
}
@@ -4899,6 +4877,7 @@
// FIXME - <rdar://problem/4727645> - At some point in the future, we might actually honor the "mimeType"
IconURL newURL(KURL(ParsedURLString, url), sizes, mimeType, iconType);
+ m_iconURLs.append(newURL);
if (Frame* f = frame()) {
IconURL iconURL = f->loader()->icon()->iconURL(iconType);
@@ -4911,7 +4890,7 @@
{
if (m_useSecureKeyboardEntryWhenActive == usesSecureKeyboard)
return;
-
+
m_useSecureKeyboardEntryWhenActive = usesSecureKeyboard;
m_frame->selection()->updateSecureKeyboardEntryIfActive();
}
Modified: trunk/Source/WebCore/dom/Document.h (122204 => 122205)
--- trunk/Source/WebCore/dom/Document.h 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/Source/WebCore/dom/Document.h 2012-07-10 08:46:08 UTC (rev 122205)
@@ -939,7 +939,7 @@
void setHasNodesWithPlaceholderStyle() { m_hasNodesWithPlaceholderStyle = true; }
- const Vector<IconURL>& iconURLs();
+ const Vector<IconURL>& iconURLs() const;
void addIconURL(const String& url, const String& mimeType, const String& size, IconType);
void setUseSecureKeyboardEntryWhenActive(bool);
Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (122204 => 122205)
--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2012-07-10 08:46:08 UTC (rev 122205)
@@ -418,16 +418,6 @@
return getAttribute(typeAttr);
}
-IconType HTMLLinkElement::iconType() const
-{
- return m_relAttribute.m_iconType;
-}
-
-String HTMLLinkElement::iconSizes() const
-{
- return m_sizes->toString();
-}
-
void HTMLLinkElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
{
HTMLElement::addSubresourceAttributeURLs(urls);
Modified: trunk/Source/WebCore/html/HTMLLinkElement.h (122204 => 122205)
--- trunk/Source/WebCore/html/HTMLLinkElement.h 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/Source/WebCore/html/HTMLLinkElement.h 2012-07-10 08:46:08 UTC (rev 122205)
@@ -55,11 +55,6 @@
String type() const;
- IconType iconType() const;
-
- // the icon size string as parsed from the HTML attribute
- String iconSizes() const;
-
CSSStyleSheet* sheet() const { return m_sheet.get(); }
bool styleSheetIsLoading() const;
Modified: trunk/Source/WebCore/testing/Internals.cpp (122204 => 122205)
--- trunk/Source/WebCore/testing/Internals.cpp 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/Source/WebCore/testing/Internals.cpp 2012-07-10 08:46:08 UTC (rev 122205)
@@ -1156,18 +1156,6 @@
return counterValueForElement(element);
}
-PassRefPtr<DOMStringList> Internals::iconURLs(Document* document) const
-{
- Vector<IconURL> iconURLs = document->iconURLs();
- RefPtr<DOMStringList> stringList = DOMStringList::create();
-
- Vector<IconURL>::const_iterator iter(iconURLs.begin());
- for (; iter != iconURLs.end(); ++iter)
- stringList->append(iter->m_iconURL.string());
-
- return stringList.release();
-}
-
#if ENABLE(FULLSCREEN_API)
void Internals::webkitWillEnterFullScreenForElement(Document* document, Element* element)
{
Modified: trunk/Source/WebCore/testing/Internals.h (122204 => 122205)
--- trunk/Source/WebCore/testing/Internals.h 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/Source/WebCore/testing/Internals.h 2012-07-10 08:46:08 UTC (rev 122205)
@@ -185,7 +185,6 @@
#endif
String counterValue(Element*);
- PassRefPtr<DOMStringList> iconURLs(Document*) const;
#if ENABLE(FULLSCREEN_API)
void webkitWillEnterFullScreenForElement(Document*, Element*);
Modified: trunk/Source/WebCore/testing/Internals.idl (122204 => 122205)
--- trunk/Source/WebCore/testing/Internals.idl 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/Source/WebCore/testing/Internals.idl 2012-07-10 08:46:08 UTC (rev 122205)
@@ -165,7 +165,6 @@
[Conditional=INSPECTOR] sequence<String> consoleMessageArgumentCounts(in Document document);
DOMString counterValue(in Element element);
- DOMString[] iconURLs(in Document document);
#if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
void webkitWillEnterFullScreenForElement(in Document document, in Element element);
Modified: trunk/Source/WebKit2/ChangeLog (122204 => 122205)
--- trunk/Source/WebKit2/ChangeLog 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-10 08:46:08 UTC (rev 122205)
@@ -1,3 +1,14 @@
+2012-07-10 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r122178.
+ http://trac.webkit.org/changeset/122178
+ https://bugs.webkit.org/show_bug.cgi?id=90857
+
+ browser tests, PrerenderBrowserTest.PrerenderFavicon and other
+ tests, started to fail (Requested by hayato on #webkit).
+
+ * win/WebKit2.def:
+
2012-07-09 Matt Falkenhagen <[email protected]>
Add ENABLE_DIALOG_ELEMENT and skeleton files
Modified: trunk/Source/WebKit2/win/WebKit2.def (122204 => 122205)
--- trunk/Source/WebKit2/win/WebKit2.def 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/Source/WebKit2/win/WebKit2.def 2012-07-10 08:46:08 UTC (rev 122205)
@@ -275,4 +275,3 @@
?jsStringSlowCase@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@AAV?$HashMap@PAVStringImpl@WTF@@V?$Weak@VJSString@JSC@@@JSC@@U?$PtrHash@PAVStringImpl@WTF@@@2@U?$HashTraits@PAVStringImpl@WTF@@@2@U?$HashTraits@V?$Weak@VJSString@JSC@@@JSC@@@2@@WTF@@PAVStringImpl@6@@Z
?registerURLSchemeAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z
?removeURLSchemeRegisteredAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z
- ?iconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@XZ
\ No newline at end of file
Modified: trunk/Source/autotools/symbols.filter (122204 => 122205)
--- trunk/Source/autotools/symbols.filter 2012-07-10 07:55:50 UTC (rev 122204)
+++ trunk/Source/autotools/symbols.filter 2012-07-10 08:46:08 UTC (rev 122205)
@@ -37,7 +37,6 @@
_ZN7WebCore5Range6createEN3WTF10PassRefPtrINS_8DocumentEEENS2_INS_4NodeEEEiS6_i;
_ZN7WebCore5RangeD1Ev;
_ZN7WebCore8Document36updateLayoutIgnorePendingStylesheetsEv;
-_ZN7WebCore8Document8iconURLsEv;
_ZN7WebCore9HTMLNames8inputTagE;
_ZN7WebCore9HTMLNames11textareaTagE;
_ZN7WebCore10JSDocument10putVirtualEPN3JSC9ExecStateERKNS1_10IdentifierENS1_7JSValueERNS1_15PutPropertySlotE;
