diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebKit/cf | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebKit/cf')
| -rw-r--r-- | WebKit/cf/ChangeLog | 12 | ||||
| -rw-r--r-- | WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp | 10 |
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> |