Changeset 144572 in webkit


Ignore:
Timestamp:
Mar 3, 2013 3:47:47 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r144567.
http://trac.webkit.org/changeset/144567
https://bugs.webkit.org/show_bug.cgi?id=111266

Does not compile on apple-win (Requested by abarth on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-03-03

.:

  • Source/autotools/symbols.filter:

Source/WebCore:

  • WebCore.exp.in:
  • dom/Document.cpp:

(WebCore::Document::iconURLs):

  • dom/Document.h:

(Document):

  • loader/icon/IconController.cpp:

(WebCore::IconController::iconURL):
(WebCore::IconController::urlsForTypes):

  • loader/icon/IconController.h:

(IconController):

  • testing/Internals.cpp:

(WebCore::Internals::iconURLs):

  • testing/Internals.h:
  • testing/Internals.idl:

Source/WebKit:

  • WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:

Source/WebKit/chromium:

  • public/WebFrame.h:
  • src/WebFrameImpl.cpp:

(WebKit::WebFrameImpl::iconURLs):

  • src/WebFrameImpl.h:

(WebFrameImpl):

Source/WebKit/win:

  • WebKit.vcproj/WebKitExports.def.in:

LayoutTests:

  • fast/dom/icon-url-change.html:
  • fast/dom/icon-url-list-apple-touch-expected.txt: Removed.
  • fast/dom/icon-url-list-apple-touch.html: Removed.
  • fast/dom/icon-url-list.html:
  • fast/dom/icon-url-property.html:
  • platform/chromium-android/fast/dom/icon-url-list-apple-touch-expected.txt: Removed.
Location:
trunk
Files:
3 deleted
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r144567 r144572  
     12013-03-03  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r144567.
     4        http://trac.webkit.org/changeset/144567
     5        https://bugs.webkit.org/show_bug.cgi?id=111266
     6
     7        Does not compile on apple-win (Requested by abarth on
     8        #webkit).
     9
     10        * Source/autotools/symbols.filter:
     11
    1122013-03-03  Ruslan Abdikeev  <aruslan@chromium.org>
    213
  • trunk/LayoutTests/ChangeLog

    r144567 r144572  
     12013-03-03  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r144567.
     4        http://trac.webkit.org/changeset/144567
     5        https://bugs.webkit.org/show_bug.cgi?id=111266
     6
     7        Does not compile on apple-win (Requested by abarth on
     8        #webkit).
     9
     10        * fast/dom/icon-url-change.html:
     11        * fast/dom/icon-url-list-apple-touch-expected.txt: Removed.
     12        * fast/dom/icon-url-list-apple-touch.html: Removed.
     13        * fast/dom/icon-url-list.html:
     14        * fast/dom/icon-url-property.html:
     15        * platform/chromium-android/fast/dom/icon-url-list-apple-touch-expected.txt: Removed.
     16
    1172013-03-03  Ruslan Abdikeev  <aruslan@chromium.org>
    218
  • trunk/LayoutTests/fast/dom/icon-url-change.html

    r144567 r144572  
    4646    // check that the URL list in the document is as we expect
    4747    var expectedURLs = "http://test.com/oldfavicon.ico";
    48     var iconURLs = window.internals.shortcutIconURLs(document);
     48    var iconURLs = window.internals.iconURLs(document);
    4949    if (expectedURLs == iconURLs[0])
    5050        testPassed('URL list matches expected');
  • trunk/LayoutTests/fast/dom/icon-url-list.html

    r144567 r144572  
    4949    var expectedURL1 = "http://test.com/foofavicon.ico";
    5050    var expectedURL2 = "http://test.com/newfavicon.ico";
    51     var iconURLs = window.internals.shortcutIconURLs(document);
     51    var iconURLs = window.internals.iconURLs(document);
    5252    if (expectedURL0 == iconURLs[0] && expectedURL1 == iconURLs[1] && expectedURL2 == iconURLs[2])
    5353        testPassed('URL list matches expected');
  • trunk/LayoutTests/fast/dom/icon-url-property.html

    r144567 r144572  
    4444    // check that the URL list in the document is as we expect
    4545    var expectedURLs = "http://test.com/newfavicon.ico";
    46     var iconURLs = window.internals.shortcutIconURLs(document);
     46    var iconURLs = window.internals.iconURLs(document);
    4747    if (expectedURLs == iconURLs[0])
    4848        debugOutput('PASS - URL list matches expected');
  • trunk/Source/WebCore/ChangeLog

    r144571 r144572  
     12013-03-03  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r144567.
     4        http://trac.webkit.org/changeset/144567
     5        https://bugs.webkit.org/show_bug.cgi?id=111266
     6
     7        Does not compile on apple-win (Requested by abarth on
     8        #webkit).
     9
     10        * WebCore.exp.in:
     11        * dom/Document.cpp:
     12        (WebCore::Document::iconURLs):
     13        * dom/Document.h:
     14        (Document):
     15        * loader/icon/IconController.cpp:
     16        (WebCore::IconController::iconURL):
     17        (WebCore::IconController::urlsForTypes):
     18        * loader/icon/IconController.h:
     19        (IconController):
     20        * testing/Internals.cpp:
     21        (WebCore::Internals::iconURLs):
     22        * testing/Internals.h:
     23        * testing/Internals.idl:
     24
    1252013-03-03  Mike West  <mkwst@chromium.org>
    226
  • trunk/Source/WebCore/WebCore.exp.in

    r144567 r144572  
    983983__ZN7WebCore8FormData28removeGeneratedFilesIfNeededEv
    984984__ZN7WebCore8FormData6decodeERN3WTF7DecoderE
    985 __ZN7WebCore8Document8iconURLsEi
    986 __ZN7WebCore8Document16shortcutIconURLsEv
     985__ZN7WebCore8Document8iconURLsEv
    987986__ZN7WebCore8FormData6createEPKvm
    988987__ZN7WebCore8FormDataD1Ev
  • trunk/Source/WebCore/dom/Document.cpp

    r144571 r144572  
    45004500}
    45014501
    4502 const Vector<IconURL>& Document::shortcutIconURLs()
    4503 {
    4504     // Include any icons where type = link, rel = "shortcut icon".
    4505     return iconURLs(Favicon);
    4506 }
    4507 
    4508 const Vector<IconURL>& Document::iconURLs(int iconTypesMask)
     4502const Vector<IconURL>& Document::iconURLs()
    45094503{
    45104504    m_iconURLs.clear();
     
    45134507        return m_iconURLs;
    45144508
     4509    // Include any icons where type = link, rel = "shortcut icon".
    45154510    RefPtr<HTMLCollection> children = head()->children();
    45164511    unsigned int length = children->length();
     
    45204515            continue;
    45214516        HTMLLinkElement* linkElement = static_cast<HTMLLinkElement*>(child);
    4522         if (!(linkElement->iconType() & iconTypesMask))
     4517        if (linkElement->iconType() != Favicon)
    45234518            continue;
    45244519        if (linkElement->href().isEmpty())
  • trunk/Source/WebCore/dom/Document.h

    r144567 r144572  
    944944    void setHasNodesWithPlaceholderStyle() { m_hasNodesWithPlaceholderStyle = true; }
    945945
    946     const Vector<IconURL>& shortcutIconURLs();
    947     const Vector<IconURL>& iconURLs(int iconTypesMask);
     946    const Vector<IconURL>& iconURLs();
    948947    void addIconURL(const String& url, const String& mimeType, const String& size, IconType);
    949948
  • trunk/Source/WebCore/loader/icon/IconController.cpp

    r144568 r144572  
    7070{
    7171    IconURL result;
    72     const Vector<IconURL>& iconURLs = m_frame->document()->iconURLs(iconType);
     72    const Vector<IconURL>& iconURLs = m_frame->document()->iconURLs();
    7373    Vector<IconURL>::const_iterator iter(iconURLs.begin());
    7474    for (; iter != iconURLs.end(); ++iter) {
    75         if (result.m_iconURL.isEmpty() || !iter->m_mimeType.isEmpty())
    76             result = *iter;
     75        if (iter->m_iconType == iconType) {
     76            if (result.m_iconURL.isEmpty() || !iter->m_mimeType.isEmpty())
     77                result = *iter;
     78        }
    7779    }
    7880
     
    8082}
    8183
    82 IconURLs IconController::urlsForTypes(int iconTypesMask)
     84IconURLs IconController::urlsForTypes(int iconTypes)
    8385{
    8486    IconURLs iconURLs;
     
    8688        return iconURLs;
    8789       
    88     if (iconTypesMask & Favicon && !appendToIconURLs(Favicon, &iconURLs))
     90    if (iconTypes & Favicon && !appendToIconURLs(Favicon, &iconURLs))
    8991        iconURLs.append(defaultURL(Favicon));
    9092
    9193#if ENABLE(TOUCH_ICON_LOADING)
    9294    int missedIcons = 0;
    93     if (iconTypesMask & TouchPrecomposedIcon)
     95    if (iconTypes & TouchPrecomposedIcon)
    9496        missedIcons += appendToIconURLs(TouchPrecomposedIcon, &iconURLs) ? 0:1;
    9597
    96     if (iconTypesMask & TouchIcon)
     98    if (iconTypes & TouchIcon)
    9799      missedIcons += appendToIconURLs(TouchIcon, &iconURLs) ? 0:1;
    98100
     
    105107
    106108    // Finally, append all remaining icons of this type.
    107     const Vector<IconURL>& allIconURLs = m_frame->document()->iconURLs(iconTypesMask);
     109    const Vector<IconURL>& allIconURLs = m_frame->document()->iconURLs();
    108110    for (Vector<IconURL>::const_iterator iter = allIconURLs.begin(); iter != allIconURLs.end(); ++iter) {
     111        if (!(iter->m_iconType & iconTypes))
     112            continue;
     113
    109114        int i;
    110115        int iconCount = iconURLs.size();
  • trunk/Source/WebCore/loader/icon/IconController.h

    r144567 r144572  
    4949
    5050    KURL url();
    51     IconURLs urlsForTypes(int iconTypesMask);
     51    IconURLs urlsForTypes(int iconTypes);
    5252    IconURL iconURL(IconType) const;
    5353
  • trunk/Source/WebCore/testing/Internals.cpp

    r144567 r144572  
    17671767}
    17681768
    1769 Vector<String> Internals::iconURLs(Document* document, int iconTypesMask) const
    1770 {
    1771     Vector<IconURL> iconURLs = document->iconURLs(iconTypesMask);
     1769Vector<String> Internals::iconURLs(Document* document) const
     1770{
     1771    Vector<IconURL> iconURLs = document->iconURLs();
    17721772    Vector<String> array;
    17731773
     
    17771777
    17781778    return array;
    1779 }
    1780 
    1781 Vector<String> Internals::shortcutIconURLs(Document* document) const
    1782 {
    1783     return iconURLs(document, Favicon);
    1784 }
    1785 
    1786 Vector<String> Internals::allIconURLs(Document* document) const
    1787 {
    1788     return iconURLs(document, Favicon | TouchIcon | TouchPrecomposedIcon);
    17891779}
    17901780
  • trunk/Source/WebCore/testing/Internals.h

    r144567 r144572  
    252252
    253253    int pageNumber(Element*, float pageWidth = 800, float pageHeight = 600);
    254     Vector<String> shortcutIconURLs(Document*) const;
    255     Vector<String> allIconURLs(Document*) const;
     254    Vector<String> iconURLs(Document*) const;
    256255
    257256    int numberOfPages(float pageWidthInPixels = 800, float pageHeightInPixels = 600);
     
    300299    Document* contextDocument() const;
    301300    Frame* frame() const;
    302     Vector<String> iconURLs(Document*, int iconTypesMask) const;
    303301
    304302    DocumentMarker* markerAt(Node*, const String& markerType, unsigned index, ExceptionCode&);
  • trunk/Source/WebCore/testing/Internals.idl

    r144570 r144572  
    218218    DOMString counterValue(in Element element);
    219219    long pageNumber(in Element element, in [Optional] float pageWidth, in [Optional] float pageHeight);
    220     DOMString[] shortcutIconURLs(in Document document);
    221     DOMString[] allIconURLs(in Document document);
     220    DOMString[] iconURLs(in Document document);
    222221    long numberOfPages(in [Optional] double pageWidthInPixels, in [Optional] double pageHeightInPixels);
    223222    DOMString pageProperty(in DOMString propertyName, in long pageNumber) raises (DOMException);
  • trunk/Source/WebKit/ChangeLog

    r144109 r144572  
     12013-03-03  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r144567.
     4        http://trac.webkit.org/changeset/144567
     5        https://bugs.webkit.org/show_bug.cgi?id=111266
     6
     7        Does not compile on apple-win (Requested by abarth on
     8        #webkit).
     9
     10        * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
     11
    1122013-02-26  Roger Fong  <roger_fong@apple.com>
    213
  • trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in

    r144567 r144572  
    326326        ?registerURLSchemeAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z
    327327        ?removeURLSchemeRegisteredAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z
    328         ?shortcutIconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@XZ
    329         ?iconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@H@Z
     328        ?iconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@XZ
    330329        ?numberOfPages@PrintContext@WebCore@@SAHPAVFrame@2@ABVFloatSize@2@@Z
    331330        ?pageProperty@PrintContext@WebCore@@SA?AVString@WTF@@PAVFrame@2@PBDH@Z
  • trunk/Source/WebKit/chromium/ChangeLog

    r144571 r144572  
     12013-03-03  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r144567.
     4        http://trac.webkit.org/changeset/144567
     5        https://bugs.webkit.org/show_bug.cgi?id=111266
     6
     7        Does not compile on apple-win (Requested by abarth on
     8        #webkit).
     9
     10        * public/WebFrame.h:
     11        * src/WebFrameImpl.cpp:
     12        (WebKit::WebFrameImpl::iconURLs):
     13        * src/WebFrameImpl.h:
     14        (WebFrameImpl):
     15
    1162013-03-03  Mike West  <mkwst@chromium.org>
    217
  • trunk/Source/WebKit/chromium/public/WebFrame.h

    r144567 r144572  
    131131
    132132    // The urls of the given combination types of favicon (if any) specified by
    133     // the document loaded in this frame. The iconTypesMask is a bit-mask of
     133    // the document loaded in this frame. The iconTypes is a bit-mask of
    134134    // WebIconURL::Type values, used to select from the available set of icon
    135135    // URLs
    136     virtual WebVector<WebIconURL> iconURLs(int iconTypesMask) const = 0;
     136    virtual WebVector<WebIconURL> iconURLs(int iconTypes) const = 0;
    137137
    138138
  • trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

    r144567 r144572  
    575575}
    576576
    577 WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypesMask) const
     577WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypes) const
    578578{
    579579    // The URL to the icon may be in the header. As such, only
    580580    // ask the loader for the icon if it's finished loading.
    581581    if (frame()->loader()->state() == FrameStateComplete)
    582         return frame()->loader()->icon()->urlsForTypes(iconTypesMask);
     582        return frame()->loader()->icon()->urlsForTypes(iconTypes);
    583583    return WebVector<WebIconURL>();
    584584}
  • trunk/Source/WebKit/chromium/src/WebFrameImpl.h

    r144568 r144572  
    7979    virtual void setName(const WebString&);
    8080    virtual long long identifier() const;
    81     virtual WebVector<WebIconURL> iconURLs(int iconTypesMask) const;
     81    virtual WebVector<WebIconURL> iconURLs(int iconTypes) const;
    8282    virtual WebSize scrollOffset() const;
    8383    virtual void setScrollOffset(const WebSize&);
  • trunk/Source/WebKit/win/ChangeLog

    r144570 r144572  
     12013-03-03  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r144567.
     4        http://trac.webkit.org/changeset/144567
     5        https://bugs.webkit.org/show_bug.cgi?id=111266
     6
     7        Does not compile on apple-win (Requested by abarth on
     8        #webkit).
     9
     10        * WebKit.vcproj/WebKitExports.def.in:
     11
    1122013-03-03  Ryosuke Niwa  <rniwa@webkit.org>
    213
  • trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in

    r144570 r144572  
    328328        ?registerURLSchemeAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z
    329329        ?removeURLSchemeRegisteredAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z
    330         ?shortcutIconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@XZ
    331         ?iconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@H@Z
     330        ?iconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@XZ
    332331        ?numberOfPages@PrintContext@WebCore@@SAHPAVFrame@2@ABVFloatSize@2@@Z
    333332        ?pageProperty@PrintContext@WebCore@@SA?AVString@WTF@@PAVFrame@2@PBDH@Z
  • trunk/Source/autotools/symbols.filter

    r144567 r144572  
    4343_ZN7WebCore5RangeD1Ev;
    4444_ZN7WebCore8Document36updateLayoutIgnorePendingStylesheetsEv;
    45 _ZN7WebCore8Document8iconURLsEi;
    46 _ZN7WebCore8Document16shortcutIconURLsEv;
     45_ZN7WebCore8Document8iconURLsEv;
    4746_ZN7WebCore8Settings19minDOMTimerIntervalEv;
    4847_ZN7WebCore8Settings22setMinDOMTimerIntervalEd;
Note: See TracChangeset for help on using the changeset viewer.