Changeset 109527 in webkit


Ignore:
Timestamp:
Mar 2, 2012 1:05:09 AM (12 years ago)
Author:
aestes@apple.com
Message:

Fix errors found when building the Mac port with ICONDATABASE disabled.
https://bugs.webkit.org/show_bug.cgi?id=80059

Reviewed by Brady Eidson.

  • WebCore.exp.in: Only export IconDatabase symbols when the feature is

enabled.

  • loader/icon/IconDatabase.h:

(WebCore::IconDatabase::create): WebKit calls this static method, so it
should be defined on the stub class.
(WebCore::IconDatabase::allowDatabaseCleanup): Ditto.
(WebCore::IconDatabase::checkIntegrityBeforeOpening): Ditto.

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r109525 r109527  
     12012-03-02  Andy Estes  <aestes@apple.com>
     2
     3        Fix errors found when building the Mac port with ICONDATABASE disabled.
     4        https://bugs.webkit.org/show_bug.cgi?id=80059
     5
     6        Reviewed by Brady Eidson.
     7
     8        * WebCore.exp.in: Only export IconDatabase symbols when the feature is
     9        enabled.
     10        * loader/icon/IconDatabase.h:
     11        (WebCore::IconDatabase::create): WebKit calls this static method, so it
     12        should be defined on the stub class.
     13        (WebCore::IconDatabase::allowDatabaseCleanup): Ditto.
     14        (WebCore::IconDatabase::checkIntegrityBeforeOpening): Ditto.
     15
    1162012-03-02  Luke Macpherson   <macpherson@chromium.org>
    217
  • trunk/Source/WebCore/WebCore.exp.in

    r109340 r109527  
    248248__ZN7WebCore12GCController17garbageCollectNowEv
    249249__ZN7WebCore12GCController43garbageCollectOnAlternateThreadForDebuggingEb
    250 __ZN7WebCore12IconDatabase10setEnabledEb
    251 __ZN7WebCore12IconDatabase11defaultIconERKNS_7IntSizeE
    252 __ZN7WebCore12IconDatabase14removeAllIconsEv
    253 __ZN7WebCore12IconDatabase15iconRecordCountEv
    254 __ZN7WebCore12IconDatabase19pageURLMappingCountEv
    255 __ZN7WebCore12IconDatabase20allowDatabaseCleanupEv
    256 __ZN7WebCore12IconDatabase20delayDatabaseCleanupEv   
    257 __ZN7WebCore12IconDatabase20retainIconForPageURLERKN3WTF6StringE
    258 __ZN7WebCore12IconDatabase20retainedPageURLCountEv
    259 __ZN7WebCore12IconDatabase21releaseIconForPageURLERKN3WTF6StringE
    260 __ZN7WebCore12IconDatabase23defaultDatabaseFilenameEv
    261 __ZN7WebCore12IconDatabase23iconRecordCountWithDataEv
    262 __ZN7WebCore12IconDatabase23importIconURLForPageURLERKN3WTF6StringES4_
    263 __ZN7WebCore12IconDatabase24importIconDataForIconURLEN3WTF10PassRefPtrINS_12SharedBufferEEERKNS1_6StringE
    264 __ZN7WebCore12IconDatabase25setPrivateBrowsingEnabledEb
    265 __ZN7WebCore12IconDatabase27checkIntegrityBeforeOpeningEv
    266 __ZN7WebCore12IconDatabase5closeEv
    267 __ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE
    268 __ZN7WebCore12IconDatabaseC1Ev
    269250__ZN7WebCore12PopupMenuMacC1EPNS_15PopupMenuClientE
    270251__ZN7WebCore12PrintContext12pagePropertyEPNS_5FrameEPKci
     
    12141195__ZNK7WebCore11RenderStyle21visitedDependentColorEi
    12151196__ZNK7WebCore11ScriptValue9getStringEPN3JSC9ExecStateERN3WTF6StringE
    1216 __ZNK7WebCore12IconDatabase12databasePathEv
    1217 __ZNK7WebCore12IconDatabase24shouldStopThreadActivityEv
    1218 __ZNK7WebCore12IconDatabase9isEnabledEv
    12191197__ZNK7WebCore12RenderObject14enclosingLayerEv
    12201198__ZNK7WebCore12RenderObject15localToAbsoluteERKNS_10FloatPointEbb
     
    17101688#endif
    17111689
     1690#if ENABLE(ICONDATABASE)
     1691__ZN7WebCore12IconDatabase10setEnabledEb
     1692__ZN7WebCore12IconDatabase11defaultIconERKNS_7IntSizeE
     1693__ZN7WebCore12IconDatabase14removeAllIconsEv
     1694__ZN7WebCore12IconDatabase15iconRecordCountEv
     1695__ZN7WebCore12IconDatabase19pageURLMappingCountEv
     1696__ZN7WebCore12IconDatabase20allowDatabaseCleanupEv
     1697__ZN7WebCore12IconDatabase20delayDatabaseCleanupEv   
     1698__ZN7WebCore12IconDatabase20retainIconForPageURLERKN3WTF6StringE
     1699__ZN7WebCore12IconDatabase20retainedPageURLCountEv
     1700__ZN7WebCore12IconDatabase21releaseIconForPageURLERKN3WTF6StringE
     1701__ZN7WebCore12IconDatabase23defaultDatabaseFilenameEv
     1702__ZN7WebCore12IconDatabase23iconRecordCountWithDataEv
     1703__ZN7WebCore12IconDatabase23importIconURLForPageURLERKN3WTF6StringES4_
     1704__ZN7WebCore12IconDatabase24importIconDataForIconURLEN3WTF10PassRefPtrINS_12SharedBufferEEERKNS1_6StringE
     1705__ZN7WebCore12IconDatabase25setPrivateBrowsingEnabledEb
     1706__ZN7WebCore12IconDatabase27checkIntegrityBeforeOpeningEv
     1707__ZN7WebCore12IconDatabase5closeEv
     1708__ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE
     1709__ZN7WebCore12IconDatabaseC1Ev
     1710__ZNK7WebCore12IconDatabase12databasePathEv
     1711__ZNK7WebCore12IconDatabase24shouldStopThreadActivityEv
     1712__ZNK7WebCore12IconDatabase9isEnabledEv
     1713#endif // ENABLE(ICONDATABASE)
     1714
    17121715#if ENABLE(INSPECTOR)
    17131716__ZN7WebCore15InspectorClient31doDispatchMessageOnFrontendPageEPNS_4PageERKN3WTF6StringE
  • trunk/Source/WebCore/loader/icon/IconDatabase.h

    r108119 r109527  
    6464class IconDatabase : public IconDatabaseBase {
    6565public:
     66    static PassOwnPtr<IconDatabase> create() { return adoptPtr(new IconDatabase); }
    6667    static void delayDatabaseCleanup() { }
     68    static void allowDatabaseCleanup() { }
     69    static void checkIntegrityBeforeOpening() { }
    6770    static String defaultDatabaseFilename() { return "WebpageIcons.db"; }
    6871};
Note: See TracChangeset for help on using the changeset viewer.