diff options
| author | Steve Block <steveblock@google.com> | 2011-05-13 06:44:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-13 06:44:40 -0700 |
| commit | 08014c20784f3db5df3a89b73cce46037b77eb59 (patch) | |
| tree | 47749210d31e19e6e2f64036fa8fae2ad693476f /WebKit/cf | |
| parent | 860220379e56aeb66424861ad602b07ee22b4055 (diff) | |
| parent | 4c3661f7918f8b3f139f824efb7855bedccb4c94 (diff) | |
| download | external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.zip external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.gz external_webkit-08014c20784f3db5df3a89b73cce46037b77eb59.tar.bz2 | |
Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3
* changes:
Merge WebKit at r75315: Update WebKit version
Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
Merge WebKit at r75315: Stub out AXObjectCache::remove()
Merge WebKit at r75315: Fix ImageBuffer
Merge WebKit at r75315: Fix PluginData::initPlugins()
Merge WebKit at r75315: Fix conflicts
Merge WebKit at r75315: Fix Makefiles
Merge WebKit at r75315: Move Android-specific WebCore files to Source
Merge WebKit at r75315: Initial merge by git.
Diffstat (limited to 'WebKit/cf')
| -rw-r--r-- | WebKit/cf/ChangeLog | 12 | ||||
| -rw-r--r-- | WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp | 7 |
2 files changed, 17 insertions, 2 deletions
diff --git a/WebKit/cf/ChangeLog b/WebKit/cf/ChangeLog index 1efdd4d..f712c97 100644 --- a/WebKit/cf/ChangeLog +++ b/WebKit/cf/ChangeLog @@ -1,3 +1,15 @@ +2011-01-03 Pratik Solanki <psolanki@apple.com> + + Mac build fix. Define WTF_USE_CFNETWORK for Windows build only. + + * WebCoreSupport/WebInspectorClientCF.cpp: + +2011-01-03 Brian Weinstein <bweinstein@apple.com> + + Windows build fix. Define WTF_USE_CFNETWORK in WebInspectorClientCF. + + * WebCoreSupport/WebInspectorClientCF.cpp: + 2010-10-18 Pavel Feldman <pfeldman@chromium.org> Reviewed by Simon Fraser. diff --git a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp index 62fdd4d..9183fa4 100644 --- a/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp +++ b/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp @@ -27,8 +27,8 @@ // 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 // 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 and WTF_USE_JSC -// manually, but we need a better long-term solution. +// Windows one here. For now we can just define WTF_PLATFORM_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 #endif @@ -38,6 +38,9 @@ #endif #if defined(WIN32) || defined(_WIN32) +#ifndef WTF_USE_CFNETWORK +#define WTF_USE_CFNETWORK 1 +#endif #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) #define JS_EXPORTDATA __declspec(dllexport) #else |