Changeset 86721 in webkit


Ignore:
Timestamp:
May 17, 2011 5:08:47 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-05-17 Tao Bai <michaelbai@chromium.org>

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()
Location:
trunk/Source/WebKit/chromium
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/chromium/ChangeLog

    r86710 r86721  
     12011-05-17  Tao Bai  <michaelbai@chromium.org>
     2
     3        Reviewed by Darin Fisher.
     4
     5        Clear deprecated icon APIs from chromium port.
     6        https://bugs.webkit.org/show_bug.cgi?id=60989
     7
     8        * public/WebFrame.h: Removed faviconURL()
     9        * public/WebFrameClient.h: Removed didChangeIcons()
     10        * src/FrameLoaderClientImpl.cpp:
     11             Removed the code to support deprecated API
     12        (WebKit::FrameLoaderClientImpl::dispatchDidChangeIcons):
     13        * src/WebFrameImpl.cpp: Removed faviconURL()
     14        * src/WebFrameImpl.h:  Removed faviconURL()
     15
    1162011-05-17  Daniel Cheng  <dcheng@chromium.org>
    217
  • trunk/Source/WebKit/chromium/public/WebFrame.h

    r86452 r86721  
    133133    virtual WebURL url() const = 0;
    134134
    135     // DEPRECATED: Use iconIRLs instead.
    136     virtual WebURL favIconURL() const = 0;
    137 
    138135    // The urls of the given combination types of favicon (if any) specified by
    139136    // the document loaded in this frame. The iconTypes is a bit-mask of
    140137    // WebIconURL::Type values, used to select from the available set of icon
    141138    // URLs
    142     virtual WebVector<WebIconURL> iconURLs(int iconTypes) const
    143     {
    144         // FIXME : Remove the implementation, this make buildbot happy during
    145         //         the transient.
    146         return WebVector<WebIconURL>();
    147     }
     139    virtual WebVector<WebIconURL> iconURLs(int iconTypes) const = 0;
    148140
    149141    // The url of the OpenSearch Desription Document (if any) specified by
  • trunk/Source/WebKit/chromium/public/WebFrameClient.h

    r86452 r86721  
    203203    }
    204204
    205     // DEPRECATED: Implement didChangeIcon instead.
    206     virtual void didChangeIcons(WebFrame*) { }
    207 
    208205    // The icon for the page have changed.
    209206    virtual void didChangeIcon(WebFrame*, WebIconURL::Type) { }
  • trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp

    r86452 r86721  
    760760void FrameLoaderClientImpl::dispatchDidChangeIcons(WebCore::IconType type)
    761761{
    762     if (m_webFrame->client()) {
     762    if (m_webFrame->client())
    763763        m_webFrame->client()->didChangeIcon(m_webFrame, static_cast<WebIconURL::Type>(type));
    764         // FIXME : Keep the API work in the transient.
    765         if (type == WebCore::Favicon)
    766             m_webFrame->client()->didChangeIcons(m_webFrame);
    767     }
    768764}
    769765
  • trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

    r86704 r86721  
    521521}
    522522
    523 WebURL WebFrameImpl::favIconURL() const
    524 {
    525     WebVector<WebIconURL> urls = iconURLs(WebIconURL::TypeFavicon);
    526     if (urls.size())
    527         return urls[0].iconURL();
    528     return WebURL();
    529 }
    530 
    531523WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypes) const
    532524{
  • trunk/Source/WebKit/chromium/src/WebFrameImpl.h

    r86452 r86721  
    7171    virtual long long identifier() const;
    7272    virtual WebURL url() const;
    73     virtual WebURL favIconURL() const;
    7473    virtual WebVector<WebIconURL> iconURLs(int iconTypes) const;
    7574    virtual WebURL openSearchDescriptionURL() const;
Note: See TracChangeset for help on using the changeset viewer.