Changeset 86094 in webkit
- Timestamp:
- May 9, 2011 3:29:27 PM (13 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 1 deleted
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r86091 r86094 1 2011-05-09 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r86091. 4 http://trac.webkit.org/changeset/86091 5 https://bugs.webkit.org/show_bug.cgi?id=60510 6 7 Broke Chromium win release build. (Requested by dave_levin on 8 #webkit). 9 10 * WebKit.gyp: 11 * features.gypi: 12 * public/WebFrame.h: 13 * public/WebFrameClient.h: 14 (WebKit::WebFrameClient::didChangeIcons): 15 * public/WebIconURL.h: Removed. 16 * src/AssertMatchingEnums.cpp: 17 * src/FrameLoaderClientImpl.cpp: 18 (WebKit::FrameLoaderClientImpl::dispatchDidChangeIcons): 19 * src/WebFrameImpl.cpp: 20 (WebKit::WebFrameImpl::favIconURL): 21 * src/WebFrameImpl.h: 22 1 23 2011-05-09 Tao Bai <michaelbai@chromium.org> 2 24 -
trunk/Source/WebKit/chromium/WebKit.gyp
r86091 r86094 186 186 'public/WebHTTPLoadInfo.h', 187 187 'public/WebIconLoadingCompletion.h', 188 'public/WebIconType.h',189 188 'public/WebImage.h', 190 189 'public/WebImageDecoder.h', -
trunk/Source/WebKit/chromium/features.gypi
r86091 r86094 89 89 'ENABLE_SVG_USE=1', 90 90 'ENABLE_TOUCH_EVENTS=1', 91 'ENABLE_TOUCH_ICON_LOADING=1',92 91 'ENABLE_V8_SCRIPT_DEBUG_SERVER=1', 93 92 'ENABLE_VIDEO=1', -
trunk/Source/WebKit/chromium/public/WebFrame.h
r86091 r86094 34 34 #include "WebCanvas.h" 35 35 #include "WebFileSystem.h" 36 #include "WebIconURL.h"37 36 #include "WebNode.h" 38 37 #include "WebURL.h" … … 131 130 virtual WebURL url() const = 0; 132 131 133 // The url s of the given combination types of favicon (if any) specified by134 // th e document loaded in this frame.135 virtual Web Vector<WebIconURL> favIconURL(int iconTypes) const = 0;132 // The url of the favicon (if any) specified by the document loaded in 133 // this frame. 134 virtual WebURL favIconURL() const = 0; 136 135 137 136 // The url of the OpenSearch Desription Document (if any) specified by -
trunk/Source/WebKit/chromium/public/WebFrameClient.h
r86091 r86094 34 34 #include "WebCommon.h" 35 35 #include "WebFileSystem.h" 36 #include "WebIconURL.h"37 36 #include "WebNavigationPolicy.h" 38 37 #include "WebNavigationType.h" … … 204 203 205 204 // The icons for the page have changed. 206 virtual void didChangeIcons(WebFrame* , WebIconURL::WebIconType) { }205 virtual void didChangeIcons(WebFrame*) { } 207 206 208 207 // The frame's document finished loading. -
trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
r86091 r86094 47 47 #include "GeolocationPosition.h" 48 48 #include "HTMLInputElement.h" 49 #include "IconURL.h"50 49 #include "IDBFactoryBackendInterface.h" 51 50 #include "IDBKey.h" … … 75 74 #include "WebIDBFactory.h" 76 75 #include "WebIDBKey.h" 77 #include "WebIconURL.h"78 76 #include "WebInputElement.h" 79 77 #include "WebMediaPlayer.h" … … 307 305 COMPILE_ASSERT_MATCHING_ENUM(WebFontDescription::WeightBold, FontWeightBold); 308 306 309 COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::WebIconTypeInvalid, InvalidIcon);310 COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::WebIconTypeFavicon, Favicon);311 COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::WebIconTypeTouch, TouchIcon);312 COMPILE_ASSERT_MATCHING_ENUM(WebIconURL::WebIconTypeTouchPrecomposed, TouchPrecomposedIcon);313 314 307 COMPILE_ASSERT_MATCHING_ENUM(WebNode::ElementNode, Node::ELEMENT_NODE); 315 308 COMPILE_ASSERT_MATCHING_ENUM(WebNode::AttributeNode, Node::ATTRIBUTE_NODE); -
trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
r86091 r86094 761 761 { 762 762 if (m_webFrame->client()) 763 m_webFrame->client()->didChangeIcons(m_webFrame , static_cast<WebIconURL::WebIconType>(type));763 m_webFrame->client()->didChangeIcons(m_webFrame); 764 764 } 765 765 -
trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp
r86091 r86094 102 102 #include "HistoryItem.h" 103 103 #include "HitTestResult.h" 104 #include "IconURL.h"105 104 #include "InspectorController.h" 106 105 #include "Page.h" … … 139 138 #include "WebFrameClient.h" 140 139 #include "WebHistoryItem.h" 141 #include "WebIconURL.h"142 140 #include "WebInputElement.h" 143 141 #include "WebNode.h" … … 521 519 } 522 520 523 Web Vector<WebIconURL> WebFrameImpl::favIconURL(int webIconTypes) const521 WebURL WebFrameImpl::favIconURL() const 524 522 { 525 523 FrameLoader* frameLoader = m_frame->loader(); … … 527 525 // ask the loader for the favicon if it's finished loading. 528 526 if (frameLoader->state() == FrameStateComplete) { 529 WTF::Vector<WebCore::IconURL> iconURLs = frameLoader->iconURLs(webIconTypes); 530 WebVector<WebIconURL> webIconURLs(iconURLs.size()); 531 for (size_t i = 0; i < iconURLs.size(); i++) 532 webIconURLs[i] = WebIconURL(iconURLs[i].m_iconURL, static_cast<WebIconURL::WebIconType>(iconURLs[i].m_iconType)); 533 return webIconURLs; 534 } 535 return WebVector<WebIconURL>(); 527 const KURL& url = frameLoader->iconURL(); 528 if (!url.isEmpty()) 529 return url; 530 } 531 return WebURL(); 536 532 } 537 533 -
trunk/Source/WebKit/chromium/src/WebFrameImpl.h
r86091 r86094 71 71 virtual long long identifier() const; 72 72 virtual WebURL url() const; 73 virtual Web Vector<WebIconURL> favIconURL(int iconTypes) const;73 virtual WebURL favIconURL() const; 74 74 virtual WebURL openSearchDescriptionURL() const; 75 75 virtual WebString encoding() const;
Note: See TracChangeset
for help on using the changeset viewer.