summaryrefslogtreecommitdiffstats
path: root/WebKit/cf
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/cf')
-rw-r--r--WebKit/cf/ChangeLog12
-rw-r--r--WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp10
2 files changed, 22 insertions, 0 deletions
diff --git a/WebKit/cf/ChangeLog b/WebKit/cf/ChangeLog
index d651266..27caf1c 100644
--- a/WebKit/cf/ChangeLog
+++ b/WebKit/cf/ChangeLog
@@ -1,3 +1,15 @@
+2009-04-20 Steve Falkenburg <sfalken@apple.com>
+
+ Separate JavaScriptCore.dll from WebKit.dll.
+ Slight performance improvement or no change on benchmarks.
+
+ Allows us to break a circular dependency between CFNetwork and WebKit on Windows,
+ and simplifies standalone JavaScriptCore builds.
+
+ Reviewed by Oliver Hunt.
+
+ * WebCoreSupport/WebInspectorClientCF.cpp: Workaround for lack of config.h in shared WebKit file (WebKit/win uses config.h from WebCore).
+
2008-12-09 Dimitri Glazkov <dglazkov@chromium.org>
Fix bustage.
diff --git a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
index 443a35d..600d58d 100644
--- a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
+++ b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
@@ -37,6 +37,16 @@
#define WTF_USE_JSC 1
#endif
+#if defined(WIN32) || defined(_WIN32)
+#if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
+#define JS_EXPORTDATA __declspec(dllexport)
+#else
+#define JS_EXPORTDATA __declspec(dllimport)
+#endif
+#else
+#define JS_EXPORTDATA
+#endif
+
#include "WebInspectorClient.h"
#include <CoreFoundation/CoreFoundation.h>