Title: [109527] trunk/Source/WebCore
- Revision
- 109527
- Author
- [email protected]
- Date
- 2012-03-02 01:05:09 -0800 (Fri, 02 Mar 2012)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (109526 => 109527)
--- trunk/Source/WebCore/ChangeLog 2012-03-02 08:55:03 UTC (rev 109526)
+++ trunk/Source/WebCore/ChangeLog 2012-03-02 09:05:09 UTC (rev 109527)
@@ -1,3 +1,18 @@
+2012-03-02 Andy Estes <[email protected]>
+
+ 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.
+
2012-03-02 Luke Macpherson <[email protected]>
Handle CSSPropertyWebkitColorCorrection in CSSStyleApplyProperty.
Modified: trunk/Source/WebCore/WebCore.exp.in (109526 => 109527)
--- trunk/Source/WebCore/WebCore.exp.in 2012-03-02 08:55:03 UTC (rev 109526)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-03-02 09:05:09 UTC (rev 109527)
@@ -247,25 +247,6 @@
__ZN7WebCore12EventHandler9mouseDownEP7NSEvent
__ZN7WebCore12GCController17garbageCollectNowEv
__ZN7WebCore12GCController43garbageCollectOnAlternateThreadForDebuggingEb
-__ZN7WebCore12IconDatabase10setEnabledEb
-__ZN7WebCore12IconDatabase11defaultIconERKNS_7IntSizeE
-__ZN7WebCore12IconDatabase14removeAllIconsEv
-__ZN7WebCore12IconDatabase15iconRecordCountEv
-__ZN7WebCore12IconDatabase19pageURLMappingCountEv
-__ZN7WebCore12IconDatabase20allowDatabaseCleanupEv
-__ZN7WebCore12IconDatabase20delayDatabaseCleanupEv
-__ZN7WebCore12IconDatabase20retainIconForPageURLERKN3WTF6StringE
-__ZN7WebCore12IconDatabase20retainedPageURLCountEv
-__ZN7WebCore12IconDatabase21releaseIconForPageURLERKN3WTF6StringE
-__ZN7WebCore12IconDatabase23defaultDatabaseFilenameEv
-__ZN7WebCore12IconDatabase23iconRecordCountWithDataEv
-__ZN7WebCore12IconDatabase23importIconURLForPageURLERKN3WTF6StringES4_
-__ZN7WebCore12IconDatabase24importIconDataForIconURLEN3WTF10PassRefPtrINS_12SharedBufferEEERKNS1_6StringE
-__ZN7WebCore12IconDatabase25setPrivateBrowsingEnabledEb
-__ZN7WebCore12IconDatabase27checkIntegrityBeforeOpeningEv
-__ZN7WebCore12IconDatabase5closeEv
-__ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE
-__ZN7WebCore12IconDatabaseC1Ev
__ZN7WebCore12PopupMenuMacC1EPNS_15PopupMenuClientE
__ZN7WebCore12PrintContext12pagePropertyEPNS_5FrameEPKci
__ZN7WebCore12PrintContext13numberOfPagesEPNS_5FrameERKNS_9FloatSizeE
@@ -1213,9 +1194,6 @@
__ZNK7WebCore11RenderLayer19absoluteBoundingBoxEv
__ZNK7WebCore11RenderStyle21visitedDependentColorEi
__ZNK7WebCore11ScriptValue9getStringEPN3JSC9ExecStateERN3WTF6StringE
-__ZNK7WebCore12IconDatabase12databasePathEv
-__ZNK7WebCore12IconDatabase24shouldStopThreadActivityEv
-__ZNK7WebCore12IconDatabase9isEnabledEv
__ZNK7WebCore12RenderObject14enclosingLayerEv
__ZNK7WebCore12RenderObject15localToAbsoluteERKNS_10FloatPointEbb
__ZNK7WebCore12RenderObject23absoluteBoundingBoxRectEb
@@ -1709,6 +1687,31 @@
#endif
#endif
+#if ENABLE(ICONDATABASE)
+__ZN7WebCore12IconDatabase10setEnabledEb
+__ZN7WebCore12IconDatabase11defaultIconERKNS_7IntSizeE
+__ZN7WebCore12IconDatabase14removeAllIconsEv
+__ZN7WebCore12IconDatabase15iconRecordCountEv
+__ZN7WebCore12IconDatabase19pageURLMappingCountEv
+__ZN7WebCore12IconDatabase20allowDatabaseCleanupEv
+__ZN7WebCore12IconDatabase20delayDatabaseCleanupEv
+__ZN7WebCore12IconDatabase20retainIconForPageURLERKN3WTF6StringE
+__ZN7WebCore12IconDatabase20retainedPageURLCountEv
+__ZN7WebCore12IconDatabase21releaseIconForPageURLERKN3WTF6StringE
+__ZN7WebCore12IconDatabase23defaultDatabaseFilenameEv
+__ZN7WebCore12IconDatabase23iconRecordCountWithDataEv
+__ZN7WebCore12IconDatabase23importIconURLForPageURLERKN3WTF6StringES4_
+__ZN7WebCore12IconDatabase24importIconDataForIconURLEN3WTF10PassRefPtrINS_12SharedBufferEEERKNS1_6StringE
+__ZN7WebCore12IconDatabase25setPrivateBrowsingEnabledEb
+__ZN7WebCore12IconDatabase27checkIntegrityBeforeOpeningEv
+__ZN7WebCore12IconDatabase5closeEv
+__ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE
+__ZN7WebCore12IconDatabaseC1Ev
+__ZNK7WebCore12IconDatabase12databasePathEv
+__ZNK7WebCore12IconDatabase24shouldStopThreadActivityEv
+__ZNK7WebCore12IconDatabase9isEnabledEv
+#endif // ENABLE(ICONDATABASE)
+
#if ENABLE(INSPECTOR)
__ZN7WebCore15InspectorClient31doDispatchMessageOnFrontendPageEPNS_4PageERKN3WTF6StringE
__ZN7WebCore19InspectorController14enableProfilerEv
Modified: trunk/Source/WebCore/loader/icon/IconDatabase.h (109526 => 109527)
--- trunk/Source/WebCore/loader/icon/IconDatabase.h 2012-03-02 08:55:03 UTC (rev 109526)
+++ trunk/Source/WebCore/loader/icon/IconDatabase.h 2012-03-02 09:05:09 UTC (rev 109527)
@@ -63,7 +63,10 @@
// For builds with IconDatabase disabled, they'll just use a default derivation of IconDatabaseBase. Which does nothing.
class IconDatabase : public IconDatabaseBase {
public:
+ static PassOwnPtr<IconDatabase> create() { return adoptPtr(new IconDatabase); }
static void delayDatabaseCleanup() { }
+ static void allowDatabaseCleanup() { }
+ static void checkIntegrityBeforeOpening() { }
static String defaultDatabaseFilename() { return "WebpageIcons.db"; }
};
#else
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
