Changeset 122205 in webkit


Ignore:
Timestamp:
Jul 10, 2012 1:46:08 AM (12 years ago)
Author:
Csaba Osztrogonác
Message:

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).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-07-10

.:

  • Source/autotools/symbols.filter:

Source/WebCore:

  • 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:

Source/WebKit2:

  • win/WebKit2.def:

LayoutTests:

  • 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:
Location:
trunk
Files:
4 deleted
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r122195 r122205  
     12012-07-10  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r122178.
     4        http://trac.webkit.org/changeset/122178
     5        https://bugs.webkit.org/show_bug.cgi?id=90857
     6
     7        browser tests, PrerenderBrowserTest.PrerenderFavicon and other
     8        tests, started to fail (Requested by hayato on #webkit).
     9
     10        * Source/autotools/symbols.filter:
     11
    1122012-07-09  Matt Falkenhagen  <falken@chromium.org>
    213

  • trunk/LayoutTests/ChangeLog

    r122204 r122205  
     12012-07-10  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r122178.
     4        http://trac.webkit.org/changeset/122178
     5        https://bugs.webkit.org/show_bug.cgi?id=90857
     6
     7        browser tests, PrerenderBrowserTest.PrerenderFavicon and other
     8        tests, started to fail (Requested by hayato on #webkit).
     9
     10        * fast/dom/icon-url-change-expected.txt: Removed.
     11        * fast/dom/icon-url-change.html: Removed.
     12        * fast/dom/icon-url-list-expected.txt: Removed.
     13        * fast/dom/icon-url-list.html: Removed.
     14        * fast/dom/icon-url-property-expected.txt:
     15        * fast/dom/icon-url-property.html:
     16        * platform/chromium/TestExpectations:
     17
    1182012-07-10  Adam Barth  <abarth@webkit.org>
    219

  • trunk/LayoutTests/fast/dom/icon-url-property-expected.txt

    r122178 r122205  
     1main frame - didChangeIcons
    12Original iconURL is: http://test.com/oldfavicon.ico
    2 Setting new icon URL to: http://test.com/newfavicon.ico
    3 New iconURL is: http://test.com/newfavicon.ico
    4 PASS - URL list matches expected
     3Setting new icon URL to: http://test.com/newfavion.ico
     4New iconURL is: http://test.com/newfavion.ico

  • trunk/LayoutTests/fast/dom/icon-url-property.html

    r122178 r122205  
    3030
    3131function runTests() {
    32     if (window.testRunner)
     32    if (window.testRunner) {
    3333        testRunner.dumpAsText();
    34 
     34        testRunner.dumpIconChanges();
     35    }
    3536    iconURL = document.getElementsByTagName("head")[0].getElementsByTagName("link")[0].href;
    3637    debugOutput ('Original iconURL is: ' + iconURL);
    37     newURL = 'http://test.com/newfavicon.ico';
     38    newURL = 'http://test.com/newfavion.ico';
    3839    debugOutput ('Setting new icon URL to: ' + newURL);
    3940    setFavIcon(newURL);
    … …  
    4142
    4243    debugOutput ('New iconURL is: ' + iconURL);
    43 
    44     // check that the URL list in the document is as we expect
    45     var expectedURLs = "http://test.com/newfavicon.ico";
    46     var iconURLs = window.internals.iconURLs(document);
    47     if (expectedURLs == iconURLs[0])
    48         debugOutput('PASS - URL list matches expected');
    49     else
    50         debugOutput('FAIL - URL list does not match expected');
    51 
    5244}
    5345

  • trunk/LayoutTests/platform/chromium/TestExpectations

    r122204 r122205  
    18761876// BUGWK38038 : fast/url/file-http-base.html = TEXT
    18771877
     1878BUGWK33812 SKIP : fast/dom/icon-url-property.html = PASS
     1879
    18781880// New layoutTestController function added at r57993
    18791881BUGCR42696 : http/tests/xmlhttprequest/cross-origin-authorization-with-embedder.html = TIMEOUT

  • trunk/Source/WebCore/ChangeLog

    r122204 r122205  
     12012-07-10  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r122178.
     4        http://trac.webkit.org/changeset/122178
     5        https://bugs.webkit.org/show_bug.cgi?id=90857
     6
     7        browser tests, PrerenderBrowserTest.PrerenderFavicon and other
     8        tests, started to fail (Requested by hayato on #webkit).
     9
     10        * WebCore.exp.in:
     11        * dom/Document.cpp:
     12        (WebCore::Document::iconURLs):
     13        (WebCore::Document::addIconURL):
     14        (WebCore::Document::setUseSecureKeyboardEntryWhenActive):
     15        * dom/Document.h:
     16        (Document):
     17        * html/HTMLLinkElement.cpp:
     18        * html/HTMLLinkElement.h:
     19        (HTMLLinkElement):
     20        * testing/Internals.cpp:
     21        * testing/Internals.h:
     22        (Internals):
     23        * testing/Internals.idl:
     24
    1252012-07-10  Adam Barth  <abarth@webkit.org>
    226

  • trunk/Source/WebCore/WebCore.exp.in

    r122204 r122205  
    832832__ZN7WebCore8Document36updateLayoutIgnorePendingStylesheetsEv
    833833__ZN7WebCore8Document4headEv
    834 __ZN7WebCore8Document8iconURLsEv
    835834__ZN7WebCore8FormData6createEPKvm
    836835__ZN7WebCore8FormDataD1Ev

  • trunk/Source/WebCore/dom/Document.cpp

    r122178 r122205  
    48664866}
    48674867
    4868 const Vector<IconURL>& Document::iconURLs()
    4869 {
    4870     static const char* const iconMIMEType = "image/x-icon";
    4871 
    4872     m_iconURLs.clear();
    4873 
    4874     // Include any icons where type = link, rel = "shortcut icon".
    4875     RefPtr<HTMLCollection> children = head()->children();
    4876     unsigned int length = children->length();
    4877     for (unsigned int i = 0; i < length; ++i) {
    4878         Node* child = children->item(i);
    4879         if (!child->hasTagName(linkTag))
    4880             continue;
    4881         HTMLLinkElement* linkElement = static_cast<HTMLLinkElement*>(child);
    4882         if (!equalIgnoringCase(linkElement->type(), iconMIMEType) || linkElement->iconType() != Favicon)
    4883             continue;
    4884         if (linkElement->href().isEmpty())
    4885             continue;
    4886 
    4887         // Put it at the front to ensure that icons seen later take precedence as required by the spec.
    4888         IconURL newURL(linkElement->href(), linkElement->iconSizes(), linkElement->type(), linkElement->iconType());
    4889         m_iconURLs.prepend(newURL);
    4890     }
    4891 
     4868const Vector<IconURL>& Document::iconURLs() const
     4869{
    48924870    return m_iconURLs;
    48934871}
    … …  
    49004878    // FIXME - <rdar://problem/4727645> - At some point in the future, we might actually honor the "mimeType"
    49014879    IconURL newURL(KURL(ParsedURLString, url), sizes, mimeType, iconType);
     4880    m_iconURLs.append(newURL);
    49024881
    49034882    if (Frame* f = frame()) {
    … …  
    49124891    if (m_useSecureKeyboardEntryWhenActive == usesSecureKeyboard)
    49134892        return;
    4914 
     4893       
    49154894    m_useSecureKeyboardEntryWhenActive = usesSecureKeyboard;
    49164895    m_frame->selection()->updateSecureKeyboardEntryIfActive();

  • trunk/Source/WebCore/dom/Document.h

    r122178 r122205  
    940940    void setHasNodesWithPlaceholderStyle() { m_hasNodesWithPlaceholderStyle = true; }
    941941
    942     const Vector<IconURL>& iconURLs();
     942    const Vector<IconURL>& iconURLs() const;
    943943    void addIconURL(const String& url, const String& mimeType, const String& size, IconType);
    944944

  • trunk/Source/WebCore/html/HTMLLinkElement.cpp

    r122178 r122205  
    419419}
    420420
    421 IconType HTMLLinkElement::iconType() const
    422 {
    423     return m_relAttribute.m_iconType;
    424 }
    425 
    426 String HTMLLinkElement::iconSizes() const
    427 {
    428     return m_sizes->toString();
    429 }
    430 
    431421void HTMLLinkElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
    432422{

  • trunk/Source/WebCore/html/HTMLLinkElement.h

    r122178 r122205  
    5555
    5656    String type() const;
    57 
    58     IconType iconType() const;
    59 
    60     // the icon size string as parsed from the HTML attribute
    61     String iconSizes() const;
    6257
    6358    CSSStyleSheet* sheet() const { return m_sheet.get(); }

  • trunk/Source/WebCore/testing/Internals.cpp

    r122204 r122205  
    11571157}
    11581158
    1159 PassRefPtr<DOMStringList> Internals::iconURLs(Document* document) const
    1160 {
    1161     Vector<IconURL> iconURLs = document->iconURLs();
    1162     RefPtr<DOMStringList> stringList = DOMStringList::create();
    1163 
    1164     Vector<IconURL>::const_iterator iter(iconURLs.begin());
    1165     for (; iter != iconURLs.end(); ++iter)
    1166         stringList->append(iter->m_iconURL.string());
    1167 
    1168     return stringList.release();
    1169 }
    1170 
    11711159#if ENABLE(FULLSCREEN_API)
    11721160void Internals::webkitWillEnterFullScreenForElement(Document* document, Element* element)

  • trunk/Source/WebCore/testing/Internals.h

    r122204 r122205  
    186186
    187187    String counterValue(Element*);
    188     PassRefPtr<DOMStringList> iconURLs(Document*) const;
    189188
    190189#if ENABLE(FULLSCREEN_API)

  • trunk/Source/WebCore/testing/Internals.idl

    r122204 r122205  
    166166
    167167        DOMString counterValue(in Element element);
    168         DOMString[] iconURLs(in Document document);
    169168
    170169#if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API

  • trunk/Source/WebKit2/ChangeLog

    r122195 r122205  
     12012-07-10  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r122178.
     4        http://trac.webkit.org/changeset/122178
     5        https://bugs.webkit.org/show_bug.cgi?id=90857
     6
     7        browser tests, PrerenderBrowserTest.PrerenderFavicon and other
     8        tests, started to fail (Requested by hayato on #webkit).
     9
     10        * win/WebKit2.def:
     11
    1122012-07-09  Matt Falkenhagen  <falken@chromium.org>
    213

  • trunk/Source/WebKit2/win/WebKit2.def

    r122204 r122205  
    276276        ?registerURLSchemeAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z
    277277        ?removeURLSchemeRegisteredAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z
    278         ?iconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@XZ

  • trunk/Source/autotools/symbols.filter

    r122204 r122205  
    3838_ZN7WebCore5RangeD1Ev;
    3939_ZN7WebCore8Document36updateLayoutIgnorePendingStylesheetsEv;
    40 _ZN7WebCore8Document8iconURLsEv;
    4140_ZN7WebCore9HTMLNames8inputTagE;
    4241_ZN7WebCore9HTMLNames11textareaTagE;
Note: See TracChangeset for help on using the changeset viewer.