Changeset 92551 in webkit


Ignore:
Timestamp:
Aug 6, 2011 8:57:09 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

REGRESSION (r91540): Favicons are not loaded
​https://bugs.webkit.org/show_bug.cgi?id=65692

Patch by Rafael Brandao <​rafael.lobo@openbossa.org> on 2011-08-06
Reviewed by Darin Adler.

The policy that evaluates whether a page can have icon or not should not
need to be reimplemented each time a new IconDatabaseBase is derived,
so it was moved to WebCore's scope.

  • loader/icon/IconController.cpp:

(WebCore::IconController::startLoader):

  • loader/icon/IconDatabase.cpp:
  • loader/icon/IconDatabase.h:
  • loader/icon/IconDatabaseBase.cpp:

(WebCore::documentCanHaveIcon):

  • loader/icon/IconDatabaseBase.h:
Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r92549 r92551  
     12011-08-06  Rafael Brandao  <rafael.lobo@openbossa.org>
     2
     3        REGRESSION (r91540): Favicons are not loaded
     4        https://bugs.webkit.org/show_bug.cgi?id=65692
     5
     6        Reviewed by Darin Adler.
     7
     8        The policy that evaluates whether a page can have icon or not should not
     9        need to be reimplemented each time a new IconDatabaseBase is derived,
     10        so it was moved to WebCore's scope.
     11
     12        * loader/icon/IconController.cpp:
     13        (WebCore::IconController::startLoader):
     14        * loader/icon/IconDatabase.cpp:
     15        * loader/icon/IconDatabase.h:
     16        * loader/icon/IconDatabaseBase.cpp:
     17        (WebCore::documentCanHaveIcon):
     18        * loader/icon/IconDatabaseBase.h:
     19
    1202011-08-06  Kenichi Ishibashi  <bashi@chromium.org>
    221

  • trunk/Source/WebCore/loader/icon/IconController.cpp

    r91540 r92551  
    115115
    116116    ASSERT(!m_frame->tree()->parent());
    117     if (!iconDatabase().documentCanHaveIcon(m_frame->document()->url()))
     117    if (!documentCanHaveIcon(m_frame->document()->url()))
    118118        return;
    119119

  • trunk/Source/WebCore/loader/icon/IconDatabase.cpp

    r92254 r92551  
    9898    static IconDatabaseClient* defaultClient = new DefaultIconDatabaseClient();
    9999    return defaultClient;
    100 }
    101 
    102 bool IconDatabase::documentCanHaveIcon(const String& documentURL) const
    103 {
    104     return !documentURL.isEmpty() && !protocolIs(documentURL, "about");
    105100}
    106101

  • trunk/Source/WebCore/loader/icon/IconDatabase.h

    r91540 r92551  
    137137    virtual bool isOpen() const;
    138138    virtual String databasePath() const;
    139     virtual bool documentCanHaveIcon(const String& documentURL) const;
    140139    static String defaultDatabaseFilename();
    141140

  • trunk/Source/WebCore/loader/icon/IconDatabaseBase.cpp

    r81824 r92551  
    2828
    2929#include "IconDatabase.h"
     30#include "KURL.h"
    3031#include "SharedBuffer.h"
    3132
    … …  
    6768}
    6869
     70bool documentCanHaveIcon(const String& documentURL)
     71{
     72    return !documentURL.isEmpty() && !protocolIs(documentURL, "about");
     73}
     74
    6975} // namespace WebCore

  • trunk/Source/WebCore/loader/icon/IconDatabaseBase.h

    r91540 r92551  
    166166    // Used internally by WebCore
    167167    virtual bool isEnabled() const { return false; }
    168     virtual bool documentCanHaveIcon(const String&) const { return false; }
    169168       
    170169    virtual void retainIconForPageURL(const String&) { }
    … …  
    217216IconDatabaseBase& iconDatabase();
    218217void setGlobalIconDatabase(IconDatabaseBase*);
     218bool documentCanHaveIcon(const String&);
    219219
    220220} // namespace WebCore
Note: See TracChangeset for help on using the changeset viewer.