Changeset 144572 in webkit
- Timestamp:
- Mar 3, 2013 3:47:47 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 3 deleted
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r144567 r144572 1 2013-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 1 12 2013-03-03 Ruslan Abdikeev <aruslan@chromium.org> 2 13 -
trunk/LayoutTests/ChangeLog
r144567 r144572 1 2013-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 1 17 2013-03-03 Ruslan Abdikeev <aruslan@chromium.org> 2 18 -
trunk/LayoutTests/fast/dom/icon-url-change.html
r144567 r144572 46 46 // check that the URL list in the document is as we expect 47 47 var expectedURLs = "http://test.com/oldfavicon.ico"; 48 var iconURLs = window.internals. shortcutIconURLs(document);48 var iconURLs = window.internals.iconURLs(document); 49 49 if (expectedURLs == iconURLs[0]) 50 50 testPassed('URL list matches expected'); -
trunk/LayoutTests/fast/dom/icon-url-list.html
r144567 r144572 49 49 var expectedURL1 = "http://test.com/foofavicon.ico"; 50 50 var expectedURL2 = "http://test.com/newfavicon.ico"; 51 var iconURLs = window.internals. shortcutIconURLs(document);51 var iconURLs = window.internals.iconURLs(document); 52 52 if (expectedURL0 == iconURLs[0] && expectedURL1 == iconURLs[1] && expectedURL2 == iconURLs[2]) 53 53 testPassed('URL list matches expected'); -
trunk/LayoutTests/fast/dom/icon-url-property.html
r144567 r144572 44 44 // check that the URL list in the document is as we expect 45 45 var expectedURLs = "http://test.com/newfavicon.ico"; 46 var iconURLs = window.internals. shortcutIconURLs(document);46 var iconURLs = window.internals.iconURLs(document); 47 47 if (expectedURLs == iconURLs[0]) 48 48 debugOutput('PASS - URL list matches expected'); -
trunk/Source/WebCore/ChangeLog
r144571 r144572 1 2013-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 1 25 2013-03-03 Mike West <mkwst@chromium.org> 2 26 -
trunk/Source/WebCore/WebCore.exp.in
r144567 r144572 983 983 __ZN7WebCore8FormData28removeGeneratedFilesIfNeededEv 984 984 __ZN7WebCore8FormData6decodeERN3WTF7DecoderE 985 __ZN7WebCore8Document8iconURLsEi 986 __ZN7WebCore8Document16shortcutIconURLsEv 985 __ZN7WebCore8Document8iconURLsEv 987 986 __ZN7WebCore8FormData6createEPKvm 988 987 __ZN7WebCore8FormDataD1Ev -
trunk/Source/WebCore/dom/Document.cpp
r144571 r144572 4500 4500 } 4501 4501 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) 4502 const Vector<IconURL>& Document::iconURLs() 4509 4503 { 4510 4504 m_iconURLs.clear(); … … 4513 4507 return m_iconURLs; 4514 4508 4509 // Include any icons where type = link, rel = "shortcut icon". 4515 4510 RefPtr<HTMLCollection> children = head()->children(); 4516 4511 unsigned int length = children->length(); … … 4520 4515 continue; 4521 4516 HTMLLinkElement* linkElement = static_cast<HTMLLinkElement*>(child); 4522 if ( !(linkElement->iconType() & iconTypesMask))4517 if (linkElement->iconType() != Favicon) 4523 4518 continue; 4524 4519 if (linkElement->href().isEmpty()) -
trunk/Source/WebCore/dom/Document.h
r144567 r144572 944 944 void setHasNodesWithPlaceholderStyle() { m_hasNodesWithPlaceholderStyle = true; } 945 945 946 const Vector<IconURL>& shortcutIconURLs(); 947 const Vector<IconURL>& iconURLs(int iconTypesMask); 946 const Vector<IconURL>& iconURLs(); 948 947 void addIconURL(const String& url, const String& mimeType, const String& size, IconType); 949 948 -
trunk/Source/WebCore/loader/icon/IconController.cpp
r144568 r144572 70 70 { 71 71 IconURL result; 72 const Vector<IconURL>& iconURLs = m_frame->document()->iconURLs( iconType);72 const Vector<IconURL>& iconURLs = m_frame->document()->iconURLs(); 73 73 Vector<IconURL>::const_iterator iter(iconURLs.begin()); 74 74 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 } 77 79 } 78 80 … … 80 82 } 81 83 82 IconURLs IconController::urlsForTypes(int iconTypes Mask)84 IconURLs IconController::urlsForTypes(int iconTypes) 83 85 { 84 86 IconURLs iconURLs; … … 86 88 return iconURLs; 87 89 88 if (iconTypes Mask& Favicon && !appendToIconURLs(Favicon, &iconURLs))90 if (iconTypes & Favicon && !appendToIconURLs(Favicon, &iconURLs)) 89 91 iconURLs.append(defaultURL(Favicon)); 90 92 91 93 #if ENABLE(TOUCH_ICON_LOADING) 92 94 int missedIcons = 0; 93 if (iconTypes Mask& TouchPrecomposedIcon)95 if (iconTypes & TouchPrecomposedIcon) 94 96 missedIcons += appendToIconURLs(TouchPrecomposedIcon, &iconURLs) ? 0:1; 95 97 96 if (iconTypes Mask& TouchIcon)98 if (iconTypes & TouchIcon) 97 99 missedIcons += appendToIconURLs(TouchIcon, &iconURLs) ? 0:1; 98 100 … … 105 107 106 108 // 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(); 108 110 for (Vector<IconURL>::const_iterator iter = allIconURLs.begin(); iter != allIconURLs.end(); ++iter) { 111 if (!(iter->m_iconType & iconTypes)) 112 continue; 113 109 114 int i; 110 115 int iconCount = iconURLs.size(); -
trunk/Source/WebCore/loader/icon/IconController.h
r144567 r144572 49 49 50 50 KURL url(); 51 IconURLs urlsForTypes(int iconTypes Mask);51 IconURLs urlsForTypes(int iconTypes); 52 52 IconURL iconURL(IconType) const; 53 53 -
trunk/Source/WebCore/testing/Internals.cpp
r144567 r144572 1767 1767 } 1768 1768 1769 Vector<String> Internals::iconURLs(Document* document , int iconTypesMask) const1770 { 1771 Vector<IconURL> iconURLs = document->iconURLs( iconTypesMask);1769 Vector<String> Internals::iconURLs(Document* document) const 1770 { 1771 Vector<IconURL> iconURLs = document->iconURLs(); 1772 1772 Vector<String> array; 1773 1773 … … 1777 1777 1778 1778 return array; 1779 }1780 1781 Vector<String> Internals::shortcutIconURLs(Document* document) const1782 {1783 return iconURLs(document, Favicon);1784 }1785 1786 Vector<String> Internals::allIconURLs(Document* document) const1787 {1788 return iconURLs(document, Favicon | TouchIcon | TouchPrecomposedIcon);1789 1779 } 1790 1780 -
trunk/Source/WebCore/testing/Internals.h
r144567 r144572 252 252 253 253 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; 256 255 257 256 int numberOfPages(float pageWidthInPixels = 800, float pageHeightInPixels = 600); … … 300 299 Document* contextDocument() const; 301 300 Frame* frame() const; 302 Vector<String> iconURLs(Document*, int iconTypesMask) const;303 301 304 302 DocumentMarker* markerAt(Node*, const String& markerType, unsigned index, ExceptionCode&); -
trunk/Source/WebCore/testing/Internals.idl
r144570 r144572 218 218 DOMString counterValue(in Element element); 219 219 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); 222 221 long numberOfPages(in [Optional] double pageWidthInPixels, in [Optional] double pageHeightInPixels); 223 222 DOMString pageProperty(in DOMString propertyName, in long pageNumber) raises (DOMException); -
trunk/Source/WebKit/ChangeLog
r144109 r144572 1 2013-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 1 12 2013-02-26 Roger Fong <roger_fong@apple.com> 2 13 -
trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in
r144567 r144572 326 326 ?registerURLSchemeAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z 327 327 ?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 330 329 ?numberOfPages@PrintContext@WebCore@@SAHPAVFrame@2@ABVFloatSize@2@@Z 331 330 ?pageProperty@PrintContext@WebCore@@SA?AVString@WTF@@PAVFrame@2@PBDH@Z -
trunk/Source/WebKit/chromium/ChangeLog
r144571 r144572 1 2013-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 1 16 2013-03-03 Mike West <mkwst@chromium.org> 2 17 -
trunk/Source/WebKit/chromium/public/WebFrame.h
r144567 r144572 131 131 132 132 // The urls of the given combination types of favicon (if any) specified by 133 // the document loaded in this frame. The iconTypes Maskis a bit-mask of133 // the document loaded in this frame. The iconTypes is a bit-mask of 134 134 // WebIconURL::Type values, used to select from the available set of icon 135 135 // URLs 136 virtual WebVector<WebIconURL> iconURLs(int iconTypes Mask) const = 0;136 virtual WebVector<WebIconURL> iconURLs(int iconTypes) const = 0; 137 137 138 138 -
trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp
r144567 r144572 575 575 } 576 576 577 WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypes Mask) const577 WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypes) const 578 578 { 579 579 // The URL to the icon may be in the header. As such, only 580 580 // ask the loader for the icon if it's finished loading. 581 581 if (frame()->loader()->state() == FrameStateComplete) 582 return frame()->loader()->icon()->urlsForTypes(iconTypes Mask);582 return frame()->loader()->icon()->urlsForTypes(iconTypes); 583 583 return WebVector<WebIconURL>(); 584 584 } -
trunk/Source/WebKit/chromium/src/WebFrameImpl.h
r144568 r144572 79 79 virtual void setName(const WebString&); 80 80 virtual long long identifier() const; 81 virtual WebVector<WebIconURL> iconURLs(int iconTypes Mask) const;81 virtual WebVector<WebIconURL> iconURLs(int iconTypes) const; 82 82 virtual WebSize scrollOffset() const; 83 83 virtual void setScrollOffset(const WebSize&); -
trunk/Source/WebKit/win/ChangeLog
r144570 r144572 1 2013-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 1 12 2013-03-03 Ryosuke Niwa <rniwa@webkit.org> 2 13 -
trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in
r144570 r144572 328 328 ?registerURLSchemeAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z 329 329 ?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 332 331 ?numberOfPages@PrintContext@WebCore@@SAHPAVFrame@2@ABVFloatSize@2@@Z 333 332 ?pageProperty@PrintContext@WebCore@@SA?AVString@WTF@@PAVFrame@2@PBDH@Z -
trunk/Source/autotools/symbols.filter
r144567 r144572 43 43 _ZN7WebCore5RangeD1Ev; 44 44 _ZN7WebCore8Document36updateLayoutIgnorePendingStylesheetsEv; 45 _ZN7WebCore8Document8iconURLsEi; 46 _ZN7WebCore8Document16shortcutIconURLsEv; 45 _ZN7WebCore8Document8iconURLsEv; 47 46 _ZN7WebCore8Settings19minDOMTimerIntervalEv; 48 47 _ZN7WebCore8Settings22setMinDOMTimerIntervalEd;
Note: See TracChangeset
for help on using the changeset viewer.