diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit/cf | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit/cf')
| -rw-r--r-- | Source/WebKit/cf/ChangeLog | 9 | ||||
| -rw-r--r-- | Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/Source/WebKit/cf/ChangeLog b/Source/WebKit/cf/ChangeLog index b418540..1826525 100644 --- a/Source/WebKit/cf/ChangeLog +++ b/Source/WebKit/cf/ChangeLog @@ -1,3 +1,12 @@ +2011-02-23 Patrick Gansterer <paroga@webkit.org> + + Reviewed by Darin Adler. + + Rename PLATFORM(CF) to USE(CF) + https://bugs.webkit.org/show_bug.cgi?id=53540 + + * WebCoreSupport/WebInspectorClientCF.cpp: + 2011-02-03 Yury Semikhatsky <yurys@chromium.org> Reviewed by Pavel Feldman. diff --git a/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp b/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp index b9afa1a..7fe7e5f 100644 --- a/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp +++ b/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp @@ -25,12 +25,12 @@ // FIXME: On Windows, we require all WebKit source files to include config.h // before including any other files. Failing to include config.h will leave -// WTF_PLATFORM_CF and WTF_USE_JSC undefined, causing build failures in this +// WTF_USE_CF and WTF_USE_JSC undefined, causing build failures in this // file. But Mac doesn't have a config.h for WebKit, so we can't include the -// Windows one here. For now we can just define WTF_PLATFORM_CF, WTF_USE_JSC, and +// Windows one here. For now we can just define WTF_USE_CF, WTF_USE_JSC, and // WTF_USE_CFNETWORK manually, but we need a better long-term solution. -#ifndef WTF_PLATFORM_CF -#define WTF_PLATFORM_CF 1 +#ifndef WTF_USE_CF +#define WTF_USE_CF 1 #endif #ifndef WTF_USE_JSC |