Title: [86721] trunk/Source/WebKit/chromium
- Revision
- 86721
- Author
- [email protected]
- Date
- 2011-05-17 17:08:47 -0700 (Tue, 17 May 2011)
Log Message
2011-05-17 Tao Bai <[email protected]>
Reviewed by Darin Fisher.
Clear deprecated icon APIs from chromium port.
https://bugs.webkit.org/show_bug.cgi?id=60989
* public/WebFrame.h: Removed faviconURL()
* public/WebFrameClient.h: Removed didChangeIcons()
* src/FrameLoaderClientImpl.cpp:
Removed the code to support deprecated API
(WebKit::FrameLoaderClientImpl::dispatchDidChangeIcons):
* src/WebFrameImpl.cpp: Removed faviconURL()
* src/WebFrameImpl.h: Removed faviconURL()
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (86720 => 86721)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-05-17 23:42:36 UTC (rev 86720)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-05-18 00:08:47 UTC (rev 86721)
@@ -1,3 +1,18 @@
+2011-05-17 Tao Bai <[email protected]>
+
+ Reviewed by Darin Fisher.
+
+ Clear deprecated icon APIs from chromium port.
+ https://bugs.webkit.org/show_bug.cgi?id=60989
+
+ * public/WebFrame.h: Removed faviconURL()
+ * public/WebFrameClient.h: Removed didChangeIcons()
+ * src/FrameLoaderClientImpl.cpp:
+ Removed the code to support deprecated API
+ (WebKit::FrameLoaderClientImpl::dispatchDidChangeIcons):
+ * src/WebFrameImpl.cpp: Removed faviconURL()
+ * src/WebFrameImpl.h: Removed faviconURL()
+
2011-05-17 Daniel Cheng <[email protected]>
Reviewed by Ryosuke Niwa.
Modified: trunk/Source/WebKit/chromium/public/WebFrame.h (86720 => 86721)
--- trunk/Source/WebKit/chromium/public/WebFrame.h 2011-05-17 23:42:36 UTC (rev 86720)
+++ trunk/Source/WebKit/chromium/public/WebFrame.h 2011-05-18 00:08:47 UTC (rev 86721)
@@ -132,19 +132,11 @@
// dataSource()->request().url().
virtual WebURL url() const = 0;
- // DEPRECATED: Use iconIRLs instead.
- virtual WebURL favIconURL() const = 0;
-
// The urls of the given combination types of favicon (if any) specified by
// the document loaded in this frame. The iconTypes is a bit-mask of
// WebIconURL::Type values, used to select from the available set of icon
// URLs
- virtual WebVector<WebIconURL> iconURLs(int iconTypes) const
- {
- // FIXME : Remove the implementation, this make buildbot happy during
- // the transient.
- return WebVector<WebIconURL>();
- }
+ virtual WebVector<WebIconURL> iconURLs(int iconTypes) const = 0;
// The url of the OpenSearch Desription Document (if any) specified by
// the document loaded in this frame.
Modified: trunk/Source/WebKit/chromium/public/WebFrameClient.h (86720 => 86721)
--- trunk/Source/WebKit/chromium/public/WebFrameClient.h 2011-05-17 23:42:36 UTC (rev 86720)
+++ trunk/Source/WebKit/chromium/public/WebFrameClient.h 2011-05-18 00:08:47 UTC (rev 86721)
@@ -202,9 +202,6 @@
didReceiveTitle(frame, title);
}
- // DEPRECATED: Implement didChangeIcon instead.
- virtual void didChangeIcons(WebFrame*) { }
-
// The icon for the page have changed.
virtual void didChangeIcon(WebFrame*, WebIconURL::Type) { }
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (86720 => 86721)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2011-05-17 23:42:36 UTC (rev 86720)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2011-05-18 00:08:47 UTC (rev 86721)
@@ -759,12 +759,8 @@
void FrameLoaderClientImpl::dispatchDidChangeIcons(WebCore::IconType type)
{
- if (m_webFrame->client()) {
+ if (m_webFrame->client())
m_webFrame->client()->didChangeIcon(m_webFrame, static_cast<WebIconURL::Type>(type));
- // FIXME : Keep the API work in the transient.
- if (type == WebCore::Favicon)
- m_webFrame->client()->didChangeIcons(m_webFrame);
- }
}
void FrameLoaderClientImpl::dispatchDidCommitLoad()
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (86720 => 86721)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2011-05-17 23:42:36 UTC (rev 86720)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2011-05-18 00:08:47 UTC (rev 86721)
@@ -520,14 +520,6 @@
return ds->request().url();
}
-WebURL WebFrameImpl::favIconURL() const
-{
- WebVector<WebIconURL> urls = iconURLs(WebIconURL::TypeFavicon);
- if (urls.size())
- return urls[0].iconURL();
- return WebURL();
-}
-
WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypes) const
{
FrameLoader* frameLoader = m_frame->loader();
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.h (86720 => 86721)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2011-05-17 23:42:36 UTC (rev 86720)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2011-05-18 00:08:47 UTC (rev 86721)
@@ -70,7 +70,6 @@
virtual void setName(const WebString&);
virtual long long identifier() const;
virtual WebURL url() const;
- virtual WebURL favIconURL() const;
virtual WebVector<WebIconURL> iconURLs(int iconTypes) const;
virtual WebURL openSearchDescriptionURL() const;
virtual WebString encoding() const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
