2011-02-23 Patrick Gansterer <paroga@webkit.org>
authorparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Feb 2011 11:31:19 +0000 (11:31 +0000)
committerparoga@webkit.org <paroga@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 23 Feb 2011 11:31:19 +0000 (11:31 +0000)
        Reviewed by Darin Adler.

        Rename PLATFORM(CF) to USE(CF)
        https://bugs.webkit.org/show_bug.cgi?id=53540

        * runtime/DatePrototype.cpp:
        * runtime/GCActivityCallbackCF.cpp:
        * runtime/JSGlobalData.cpp:
        (JSC::JSGlobalData::JSGlobalData):
        * wtf/CurrentTime.cpp:
        * wtf/Platform.h:
        * wtf/text/AtomicString.h:
        * wtf/text/StringImpl.h:
        (WTF::StringImpl::computeHash):
        * wtf/text/WTFString.h:
        * wtf/unicode/icu/CollatorICU.cpp:
        (WTF::Collator::userDefault):
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

        * WebCore.gyp/WebCore.gyp:
        * editing/SmartReplace.cpp:
        * editing/SmartReplaceICU.cpp:
        * loader/MainResourceLoader.cpp:
        (WebCore::MainResourceLoader::didReceiveResponse):
        (WebCore::MainResourceLoader::didReceiveData):
        (WebCore::MainResourceLoader::didFinishLoading):
        (WebCore::MainResourceLoader::didFail):
        * loader/archive/ArchiveFactory.cpp:
        (WebCore::archiveMIMETypes):
        * platform/FileSystem.h:
        * platform/KURL.h:
        * platform/KURLGoogle.cpp:
        * platform/RunLoopTimer.h:
        * platform/SharedBuffer.cpp:
        * platform/SharedBuffer.h:
        * platform/UUID.cpp:
        (WebCore::createCanonicalUUIDString):
        * platform/network/ResourceHandle.h:
        * platform/network/ResourceRequestBase.h:
        * platform/network/curl/ResourceHandleCurl.cpp:
        * platform/network/curl/ResourceHandleManager.cpp:
        (WebCore::certificatePath):
        * platform/text/cf/StringCF.cpp:
        * platform/text/cf/StringImplCF.cpp:
        * platform/win/BString.cpp:
        * platform/win/BString.h:
        * platform/win/ClipboardUtilitiesWin.cpp:
        (WebCore::getWebLocData):
        (WebCore::getURL):
        (WebCore::getClipboardData):
        * platform/win/ClipboardWin.cpp:
        (WebCore::writeFileToDataObject):
        * platform/win/SearchPopupMenuWin.cpp:
        (WebCore::SearchPopupMenuWin::enabled):
        (WebCore::SearchPopupMenuWin::saveRecentSearches):
        (WebCore::SearchPopupMenuWin::loadRecentSearches):
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-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

        * WebView.cpp:
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

        * UIProcess/WebBackForwardList.h:
        * UIProcess/WebPageProxy.cpp:
        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
        (WebKit::formatLocalizedString):
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

        * DumpRenderTree/config.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@79434 268f45cc-cd09-0410-ab3c-d52691b4dbfc

46 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/runtime/DatePrototype.cpp
Source/JavaScriptCore/runtime/GCActivityCallback.h
Source/JavaScriptCore/runtime/GCActivityCallbackCF.cpp
Source/JavaScriptCore/runtime/JSGlobalData.cpp
Source/JavaScriptCore/wtf/CurrentTime.cpp
Source/JavaScriptCore/wtf/Platform.h
Source/JavaScriptCore/wtf/RetainPtr.h
Source/JavaScriptCore/wtf/text/AtomicString.h
Source/JavaScriptCore/wtf/text/StringImpl.h
Source/JavaScriptCore/wtf/text/WTFString.h
Source/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebCore/editing/SmartReplace.cpp
Source/WebCore/editing/SmartReplaceICU.cpp
Source/WebCore/loader/MainResourceLoader.cpp
Source/WebCore/loader/archive/ArchiveFactory.cpp
Source/WebCore/platform/FileSystem.h
Source/WebCore/platform/KURL.h
Source/WebCore/platform/KURLGoogle.cpp
Source/WebCore/platform/RunLoopTimer.h
Source/WebCore/platform/SharedBuffer.cpp
Source/WebCore/platform/SharedBuffer.h
Source/WebCore/platform/UUID.cpp
Source/WebCore/platform/network/ResourceHandle.h
Source/WebCore/platform/network/ResourceRequestBase.h
Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp
Source/WebCore/platform/network/curl/ResourceHandleManager.cpp
Source/WebCore/platform/text/cf/StringCF.cpp
Source/WebCore/platform/text/cf/StringImplCF.cpp
Source/WebCore/platform/win/BString.cpp
Source/WebCore/platform/win/BString.h
Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp
Source/WebCore/platform/win/ClipboardWin.cpp
Source/WebCore/platform/win/SearchPopupMenuWin.cpp
Source/WebKit/cf/ChangeLog
Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebView.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/WebBackForwardList.h
Source/WebKit2/UIProcess/WebPageProxy.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
Tools/ChangeLog
Tools/DumpRenderTree/config.h

index 5b0b2fb..be10314 100644 (file)
@@ -1,3 +1,23 @@
+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
+
+        * runtime/DatePrototype.cpp:
+        * runtime/GCActivityCallbackCF.cpp:
+        * runtime/JSGlobalData.cpp:
+        (JSC::JSGlobalData::JSGlobalData):
+        * wtf/CurrentTime.cpp:
+        * wtf/Platform.h:
+        * wtf/text/AtomicString.h:
+        * wtf/text/StringImpl.h:
+        (WTF::StringImpl::computeHash):
+        * wtf/text/WTFString.h:
+        * wtf/unicode/icu/CollatorICU.cpp:
+        (WTF::Collator::userDefault):
+
 2011-02-23  Fumitoshi Ukai  <ukai@chromium.org>
 
         Unreviewed build fix for Windows.
index 5877c10..314baa4 100644 (file)
@@ -130,7 +130,7 @@ enum LocaleDateTimeFormat { LocaleDateAndTime, LocaleDate, LocaleTime };
 #if PLATFORM(MAC)
 
 // FIXME: Since this is superior to the strftime-based version, why limit this to PLATFORM(MAC)?
-// Instead we should consider using this whenever PLATFORM(CF) is true.
+// Instead we should consider using this whenever USE(CF) is true.
 
 static CFDateFormatterStyle styleFromArgString(const UString& string, CFDateFormatterStyle defaultStyle)
 {
index 9b6ef04..eabb4cc 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-#if PLATFORM(CF)
+#if USE(CF)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
@@ -62,7 +62,7 @@ public:
     void operator()();
     void synchronize();
 
-#if PLATFORM(CF)
+#if USE(CF)
 protected:
     DefaultGCActivityCallback(Heap*, CFRunLoopRef);
     void commonConstructor(Heap*, CFRunLoopRef);
index 211c423..15f6de8 100644 (file)
@@ -36,7 +36,7 @@
 #include <wtf/RetainPtr.h>
 #include <wtf/WTFThreadData.h>
 
-#if !PLATFORM(CF)
+#if !USE(CF)
 #error "This file should only be used on CF platforms."
 #endif
 
index dcbe3c4..14524c8 100644 (file)
@@ -160,7 +160,7 @@ JSGlobalData::JSGlobalData(GlobalDataType globalDataType, ThreadStackType thread
     startProfilerServerIfNeeded();
 #endif
 #if ENABLE(JIT) && ENABLE(INTERPRETER)
-#if PLATFORM(CF)
+#if USE(CF)
     CFStringRef canUseJITKey = CFStringCreateWithCString(0 , "JavaScriptCoreUseJIT", kCFStringEncodingMacRoman);
     CFBooleanRef canUseJIT = (CFBooleanRef)CFPreferencesCopyAppValue(canUseJITKey, kCFPreferencesCurrentApplication);
     if (canUseJIT) {
index 56724cb..4205227 100644 (file)
@@ -35,7 +35,7 @@
 
 #if OS(WINDOWS)
 
-// Windows is first since we want to use hires timers, despite PLATFORM(CF)
+// Windows is first since we want to use hires timers, despite USE(CF)
 // being defined.
 // If defined, WIN32_LEAN_AND_MEAN disables timeBeginPeriod/timeEndPeriod.
 #undef WIN32_LEAN_AND_MEAN
index 1a9afcb..aa5d1ab 100644 (file)
 #if !defined(ENABLE_DASHBOARD_SUPPORT)
 #define ENABLE_DASHBOARD_SUPPORT 1
 #endif
-#define WTF_PLATFORM_CF 1
+#define WTF_USE_CF 1
 #define WTF_USE_PTHREADS 1
 #define HAVE_PTHREAD_RWLOCK 1
 #define HAVE_READLINE 1
 #endif
 
 #if PLATFORM(CHROMIUM) && OS(DARWIN)
-#define WTF_PLATFORM_CF 1
+#define WTF_USE_CF 1
 #define WTF_USE_PTHREADS 1
 #define HAVE_PTHREAD_RWLOCK 1
 #define WTF_USE_CARBON_SECURE_INPUT_MODE 1
 #endif
 
 #if PLATFORM(QT) && OS(DARWIN)
-#define WTF_PLATFORM_CF 1
+#define WTF_USE_CF 1
 #endif
 
 #if OS(DARWIN) && !defined(BUILDING_ON_TIGER) && !PLATFORM(GTK) && !PLATFORM(QT)
 #define ENABLE_ORIENTATION_EVENTS 1
 #define ENABLE_REPAINT_THROTTLING 1
 #define HAVE_READLINE 1
-#define WTF_PLATFORM_CF 1
+#define WTF_USE_CF 1
 #define WTF_USE_PTHREADS 1
 #define HAVE_PTHREAD_RWLOCK 1
 #define ENABLE_WEB_ARCHIVE 1
 #endif
 
 #if PLATFORM(WIN) && !OS(WINCE)
-#define WTF_PLATFORM_CF 1
+#define WTF_USE_CF 1
 #define WTF_USE_PTHREADS 0
 #endif
 
 #define ENABLE_ASSEMBLER 1
 #define ENABLE_GLOBAL_FASTMALLOC_NEW 0
 #if OS(DARWIN)
-#define WTF_PLATFORM_CF 1
+#define WTF_USE_CF 1
 #ifndef BUILDING_ON_TIGER
 #define WTF_USE_CORE_TEXT 1
 #define ENABLE_WEB_ARCHIVE 1
index 62740fc..3a11589 100644 (file)
@@ -26,7 +26,7 @@
 #include "TypeTraits.h"
 #include <algorithm>
 
-#if PLATFORM(CF)
+#if USE(CF)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
index ab5b366..45a71e7 100644 (file)
@@ -95,7 +95,7 @@ public:
 
     static void remove(StringImpl*);
     
-#if PLATFORM(CF)
+#if USE(CF)
     AtomicString(CFStringRef s) :  m_string(add(String(s).impl())) { }
     CFStringRef createCFString() const { return m_string.createCFString(); }
 #endif    
index 6de87c8..4ad2dec 100644 (file)
@@ -34,7 +34,7 @@
 #include <wtf/text/StringImplBase.h>
 #include <wtf/unicode/Unicode.h>
 
-#if PLATFORM(CF)
+#if USE(CF)
 typedef const struct __CFString * CFStringRef;
 #endif
 
@@ -318,7 +318,7 @@ public:
 
     WTF::Unicode::Direction defaultWritingDirection(bool* hasStrongDirectionality = 0);
 
-#if PLATFORM(CF)
+#if USE(CF)
     CFStringRef createCFString();
 #endif
 #ifdef __OBJC__
index 7aea81e..0ac8f0e 100644 (file)
@@ -31,7 +31,7 @@
 #include <objc/objc.h>
 #endif
 
-#if PLATFORM(CF)
+#if USE(CF)
 typedef const struct __CFString * CFStringRef;
 #endif
 
@@ -289,7 +289,7 @@ public:
     operator UnspecifiedBoolTypeA() const;
     operator UnspecifiedBoolTypeB() const;
 
-#if PLATFORM(CF)
+#if USE(CF)
     String(CFStringRef);
     CFStringRef createCFString() const;
 #endif
index 805b114..ca27ba2 100644 (file)
@@ -59,7 +59,7 @@ Collator::Collator(const char* locale)
 
 PassOwnPtr<Collator> Collator::userDefault()
 {
-#if OS(DARWIN) && PLATFORM(CF)
+#if OS(DARWIN) && USE(CF)
     // Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work.
 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !OS(IOS)
     RetainPtr<CFLocaleRef> currentLocale(AdoptCF, CFLocaleCopyCurrent());
index 430ccb5..54c6000 100644 (file)
@@ -1,3 +1,48 @@
+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
+
+        * WebCore.gyp/WebCore.gyp:
+        * editing/SmartReplace.cpp:
+        * editing/SmartReplaceICU.cpp:
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::didReceiveResponse):
+        (WebCore::MainResourceLoader::didReceiveData):
+        (WebCore::MainResourceLoader::didFinishLoading):
+        (WebCore::MainResourceLoader::didFail):
+        * loader/archive/ArchiveFactory.cpp:
+        (WebCore::archiveMIMETypes):
+        * platform/FileSystem.h:
+        * platform/KURL.h:
+        * platform/KURLGoogle.cpp:
+        * platform/RunLoopTimer.h:
+        * platform/SharedBuffer.cpp:
+        * platform/SharedBuffer.h:
+        * platform/UUID.cpp:
+        (WebCore::createCanonicalUUIDString):
+        * platform/network/ResourceHandle.h:
+        * platform/network/ResourceRequestBase.h:
+        * platform/network/curl/ResourceHandleCurl.cpp:
+        * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::certificatePath):
+        * platform/text/cf/StringCF.cpp:
+        * platform/text/cf/StringImplCF.cpp:
+        * platform/win/BString.cpp:
+        * platform/win/BString.h:
+        * platform/win/ClipboardUtilitiesWin.cpp:
+        (WebCore::getWebLocData):
+        (WebCore::getURL):
+        (WebCore::getClipboardData):
+        * platform/win/ClipboardWin.cpp:
+        (WebCore::writeFileToDataObject):
+        * platform/win/SearchPopupMenuWin.cpp:
+        (WebCore::SearchPopupMenuWin::enabled):
+        (WebCore::SearchPopupMenuWin::saveRecentSearches):
+        (WebCore::SearchPopupMenuWin::loadRecentSearches):
+
 2011-02-23  Benjamin Kalman  <kalman@chromium.org>
 
         Reviewed by Ojan Vafai.
index b89fe19..4af2e9a 100644 (file)
             # Additional files from the WebCore Mac build that are presently
             # used in the WebCore Chromium Mac build too.
 
-            # The Mac build is PLATFORM_CF but does not use CFNetwork.
+            # The Mac build is USE(CF) but does not use CFNetwork.
             ['include', 'CF\\.cpp$'],
             ['exclude', 'network/cf/'],
 
index c5f5240..7b8ca45 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "SmartReplace.h"
 
-#if !PLATFORM(CF) && !USE(ICU_UNICODE)
+#if !USE(CF) && !USE(ICU_UNICODE)
 
 namespace WebCore {
 
@@ -40,4 +40,4 @@ bool isCharacterSmartReplaceExempt(UChar32 c, bool isPreviousCharacter)
 
 }
 
-#endif // !PLATFORM(CF)
+#endif // !USE(CF)
index 9acd350..c3507ad 100644 (file)
@@ -30,7 +30,7 @@
 #include "config.h"
 #include "SmartReplace.h"
 
-#if !PLATFORM(CF) && USE(ICU_UNICODE)
+#if !USE(CF) && USE(ICU_UNICODE)
 #include "PlatformString.h"
 #include <unicode/uset.h>
 #include <wtf/Assertions.h>
@@ -97,4 +97,4 @@ bool isCharacterSmartReplaceExempt(UChar32 c, bool isPreviousCharacter)
 
 }
 
-#endif // !PLATFORM(CF) && USE(ICU_UNICODE)
+#endif // !USE(CF) && USE(ICU_UNICODE)
index 4bdb9ad..eaff3a0 100644 (file)
@@ -359,7 +359,7 @@ void MainResourceLoader::didReceiveResponse(const ResourceResponse& r)
 
     // There is a bug in CFNetwork where callbacks can be dispatched even when loads are deferred.
     // See <rdar://problem/6304600> for more details.
-#if !PLATFORM(CF)
+#if !USE(CF)
     ASSERT(shouldLoadAsEmptyDocument(r.url()) || !defersLoading());
 #endif
 
@@ -426,7 +426,7 @@ void MainResourceLoader::didReceiveData(const char* data, int length, long long
 
     // There is a bug in CFNetwork where callbacks can be dispatched even when loads are deferred.
     // See <rdar://problem/6304600> for more details.
-#if !PLATFORM(CF)
+#if !USE(CF)
     ASSERT(!defersLoading());
 #endif
  
@@ -447,7 +447,7 @@ void MainResourceLoader::didFinishLoading(double finishTime)
 {
     // There is a bug in CFNetwork where callbacks can be dispatched even when loads are deferred.
     // See <rdar://problem/6304600> for more details.
-#if !PLATFORM(CF)
+#if !USE(CF)
     ASSERT(shouldLoadAsEmptyDocument(frameLoader()->activeDocumentLoader()->url()) || !defersLoading());
 #endif
     
@@ -478,7 +478,7 @@ void MainResourceLoader::didFail(const ResourceError& error)
 
     // There is a bug in CFNetwork where callbacks can be dispatched even when loads are deferred.
     // See <rdar://problem/6304600> for more details.
-#if !PLATFORM(CF)
+#if !USE(CF)
     ASSERT(!defersLoading());
 #endif
     
index b02b831..a207af7 100644 (file)
@@ -32,7 +32,7 @@
 #include "MIMETypeRegistry.h"
 #include "PlatformString.h"
 
-#if PLATFORM(CF) && !PLATFORM(QT)
+#if USE(CF) && !PLATFORM(QT)
 #include "LegacyWebArchive.h"
 #endif
 
@@ -60,7 +60,7 @@ static ArchiveMIMETypesMap& archiveMIMETypes()
     if (initialized)
         return mimeTypes;
 
-#if PLATFORM(CF)
+#if USE(CF)
     mimeTypes.set("application/x-webarchive", archiveFactoryCreate<LegacyWebArchive>);
 #endif
 
index d923fe6..8b7d0f0 100644 (file)
@@ -35,7 +35,7 @@
 #include <wtf/Forward.h>
 #include <wtf/Vector.h>
 
-#if PLATFORM(CF)
+#if USE(CF)
 #include <wtf/RetainPtr.h>
 #endif
 
@@ -47,7 +47,7 @@
 #endif
 #endif
 
-#if PLATFORM(CF) || (PLATFORM(QT) && defined(Q_WS_MAC))
+#if USE(CF) || (PLATFORM(QT) && defined(Q_WS_MAC))
 typedef struct __CFBundle* CFBundleRef;
 typedef const struct __CFData* CFDataRef;
 #endif
@@ -84,7 +84,7 @@ typedef void* PlatformModule;
 #endif
 #elif PLATFORM(GTK)
 typedef GModule* PlatformModule;
-#elif PLATFORM(CF)
+#elif USE(CF)
 typedef CFBundleRef PlatformModule;
 #else
 typedef void* PlatformModule;
@@ -189,7 +189,7 @@ bool unloadModule(PlatformModule);
 // Encode a string for use within a file name.
 String encodeForFileName(const String&);
 
-#if PLATFORM(CF)
+#if USE(CF)
 RetainPtr<CFURLRef> pathAsURL(const String&);
 #endif
 
index 521e7ca..61ea096 100644 (file)
@@ -30,7 +30,7 @@
 #include "URLString.h"
 #include <wtf/HashMap.h>
 
-#if PLATFORM(CF)
+#if USE(CF)
 typedef const struct __CFURL* CFURLRef;
 #endif
 
@@ -190,7 +190,7 @@ public:
     unsigned pathAfterLastSlash() const;
     operator const String&() const { return string(); }
 
-#if PLATFORM(CF)
+#if USE(CF)
     KURL(CFURLRef);
     CFURLRef createCFURL() const;
 #endif
index 0697b33..387c1a2 100644 (file)
@@ -381,7 +381,7 @@ KURL::KURL(const CString& canonicalSpec,
         m_url.setAscii(canonicalSpec);
 }
 
-#if PLATFORM(CF)
+#if USE(CF)
 KURL::KURL(CFURLRef)
 {
     notImplemented();
index f8c529f..867b159 100644 (file)
@@ -56,7 +56,7 @@ public:
     virtual void fired() = 0;
 
 private:
-#if PLATFORM(CF)
+#if USE(CF)
     RetainPtr<CFRunLoopTimerRef> m_timer;
 #endif
 };
index 35a7b7c..34553ec 100644 (file)
@@ -239,7 +239,7 @@ unsigned SharedBuffer::getSomeData(const char*& someData, unsigned position) con
     return segment == segments - 1 ? segmentedSize - position : segmentSize - positionInSegment;
 }
 
-#if !PLATFORM(CF) || PLATFORM(QT)
+#if !USE(CF) || PLATFORM(QT)
 
 inline void SharedBuffer::clearPlatformData()
 {
index 3c92cf3..a6517d8 100644 (file)
@@ -32,7 +32,7 @@
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
 
-#if PLATFORM(CF)
+#if USE(CF)
 #include <wtf/RetainPtr.h>
 #endif
 
@@ -69,7 +69,7 @@ public:
     NSData *createNSData();
     static PassRefPtr<SharedBuffer> wrapNSData(NSData *data);
 #endif
-#if PLATFORM(CF)
+#if USE(CF)
     CFDataRef createCFData();
     static PassRefPtr<SharedBuffer> wrapCFData(CFDataRef);
 #endif
@@ -130,7 +130,7 @@ private:
     mutable Vector<char> m_buffer;
     mutable Vector<char*> m_segments;
     OwnPtr<PurgeableBuffer> m_purgeableBuffer;
-#if PLATFORM(CF)
+#if USE(CF)
     SharedBuffer(CFDataRef);
     RetainPtr<CFDataRef> m_cfData;
 #endif
index c072f4a..7f59081 100644 (file)
 
 #if OS(WINDOWS)
 #include <objbase.h>
-#elif OS(DARWIN) && PLATFORM(CF)
+#elif OS(DARWIN) && USE(CF)
 #include <CoreFoundation/CoreFoundation.h>
 #elif OS(LINUX) && !PLATFORM(CHROMIUM)
 #include <stdio.h>
-#elif (OS(LINUX) && PLATFORM(CHROMIUM)) || (OS(DARWIN) && !PLATFORM(CF))
+#elif (OS(LINUX) && PLATFORM(CHROMIUM)) || (OS(DARWIN) && !USE(CF))
 #include <wtf/RandomNumber.h>
 #include <wtf/text/StringBuilder.h>
 #endif
@@ -71,7 +71,7 @@ String createCanonicalUUIDString()
     String canonicalUuidStr = String(uuidStr + 1, num - 3).lower(); // remove opening and closing bracket and make it lower.
     ASSERT(canonicalUuidStr[uuidVersionIdentifierIndex] == uuidVersionRequired);
     return canonicalUuidStr;
-#elif OS(DARWIN) && PLATFORM(CF)
+#elif OS(DARWIN) && USE(CF)
     CFUUIDRef uuid = CFUUIDCreate(0);
     CFStringRef uuidStrRef = CFUUIDCreateString(0, uuid);
     String uuidStr(uuidStrRef);
@@ -93,7 +93,7 @@ String createCanonicalUUIDString()
     String canonicalUuidStr = String(uuidStr).lower(); // make it lower.
     ASSERT(canonicalUuidStr[uuidVersionIdentifierIndex] == uuidVersionRequired);
     return canonicalUuidStr;
-#elif (OS(LINUX) && PLATFORM(CHROMIUM)) || (OS(DARWIN) && !PLATFORM(CF))
+#elif (OS(LINUX) && PLATFORM(CHROMIUM)) || (OS(DARWIN) && !USE(CF))
     unsigned randomData[4];
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(randomData); ++i)
         randomData[i] = static_cast<unsigned>(randomNumber() * (std::numeric_limits<unsigned>::max() + 1.0));
index 8ad66e4..9ad7652 100644 (file)
@@ -37,7 +37,7 @@
 typedef struct _SoupSession SoupSession;
 #endif
 
-#if PLATFORM(CF)
+#if USE(CF)
 typedef const struct __CFData * CFDataRef;
 #endif
 
@@ -140,7 +140,7 @@ public:
 #if PLATFORM(WIN) && USE(CURL)
     static void setHostAllowsAnyHTTPSCertificate(const String&);
 #endif
-#if PLATFORM(WIN) && USE(CURL) && PLATFORM(CF)
+#if PLATFORM(WIN) && USE(CURL) && USE(CF)
     static void setClientCertificate(const String& host, CFDataRef);
 #endif
 
@@ -210,7 +210,7 @@ private:
 
 #if PLATFORM(MAC)
     void createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff);
-#elif PLATFORM(CF)
+#elif USE(CF)
     void createCFURLConnection(bool shouldUseCredentialStorage, bool shouldContentSniff);
 #endif
 
index bf53010..ec7e32a 100644 (file)
@@ -240,7 +240,7 @@ namespace WebCore {
     
     unsigned initializeMaximumHTTPConnectionCountPerHost();
 
-#if PLATFORM(CF)
+#if USE(CF)
     bool isHTTPPipeliningEnabled();
     bool shouldForceHTTPPipeliningPriorityHigh();
 #else
index f360f86..1d276aa 100644 (file)
@@ -34,7 +34,7 @@
 #include "ResourceHandleManager.h"
 #include "SharedBuffer.h"
 
-#if PLATFORM(WIN) && PLATFORM(CF)
+#if PLATFORM(WIN) && USE(CF)
 #include <wtf/PassRefPtr.h>
 #include <wtf/RetainPtr.h>
 #endif
@@ -124,7 +124,7 @@ bool ResourceHandle::supportsBufferedData()
     return false;
 }
 
-#if PLATFORM(WIN) && PLATFORM(CF)
+#if PLATFORM(WIN) && USE(CF)
 static HashSet<String>& allowsAnyHTTPSCertificateHosts()
 {
     static HashSet<String> hosts;
@@ -138,7 +138,7 @@ void ResourceHandle::setHostAllowsAnyHTTPSCertificate(const String& host)
 }
 #endif
 
-#if PLATFORM(WIN) && PLATFORM(CF)
+#if PLATFORM(WIN) && USE(CF)
 // FIXME:  The CFDataRef will need to be something else when
 // building without 
 static HashMap<String, RetainPtr<CFDataRef> >& clientCerts()
index 2e4259c..f0fd403 100644 (file)
@@ -44,7 +44,7 @@
 
 #include <errno.h>
 #include <stdio.h>
-#if PLATFORM(CF)
+#if USE(CF)
 #include <wtf/RetainPtr.h>
 #endif
 #include <wtf/Threading.h>
@@ -66,7 +66,7 @@ static const bool ignoreSSLErrors = getenv("WEBKIT_IGNORE_SSL_ERRORS");
 
 static CString certificatePath()
 {
-#if PLATFORM(CF)
+#if USE(CF)
     CFBundleRef webKitBundle = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.WebKit"));
     if (webKitBundle) {
         RetainPtr<CFURLRef> certURLRef(AdoptCF, CFBundleCopyResourceURL(webKitBundle, CFSTR("cacert"), CFSTR("pem"), CFSTR("certificates")));
index dcaf8fb..0a1928b 100644 (file)
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "PlatformString.h"
 
-#if PLATFORM(CF)
+#if USE(CF)
 
 #include <CoreFoundation/CoreFoundation.h>
 
@@ -52,4 +52,4 @@ CFStringRef String::createCFString() const
 
 }
 
-#endif // PLATFORM(CF)
+#endif // USE(CF)
index 0157918..c99ddac 100644 (file)
@@ -21,7 +21,7 @@
 #include "config.h"
 #include <wtf/text/StringImpl.h>
 
-#if PLATFORM(CF)
+#if USE(CF)
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <wtf/MainThread.h>
@@ -159,4 +159,4 @@ CFStringRef StringImpl::createCFString()
 
 }
 
-#endif // PLATFORM(CF)
+#endif // USE(CF)
index 6622f96..872ab7e 100644 (file)
@@ -31,7 +31,7 @@
 #include <windows.h>
 #include <wtf/text/AtomicString.h>
 
-#if PLATFORM(CF)
+#if USE(CF)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
@@ -92,7 +92,7 @@ BString::BString(const UString& s)
         m_bstr = SysAllocStringLen(s.characters(), s.length());
 }
 
-#if PLATFORM(CF)
+#if USE(CF)
 BString::BString(CFStringRef cfstr)
     : m_bstr(0)
 {
index bdbf189..922d3e2 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <wtf/Forward.h>
 
-#if PLATFORM(CF)
+#if USE(CF)
 typedef const struct __CFString * CFStringRef;
 #endif
 
@@ -51,7 +51,7 @@ namespace WebCore {
         BString(const AtomicString&);
         BString(const KURL&);
         BString(const JSC::UString&);
-#if PLATFORM(CF)
+#if USE(CF)
         BString(CFStringRef);
 #endif
         ~BString();
index 77b95ef..513992d 100644 (file)
 #include <wtf/text/CString.h>
 #include <wtf/text/StringConcatenate.h>
 
-#if PLATFORM(CF)
+#if USE(CF)
 #include <CoreFoundation/CoreFoundation.h>
 #include <wtf/RetainPtr.h>
 #endif
 
 namespace WebCore {
 
-#if PLATFORM(CF)
+#if USE(CF)
 FORMATETC* cfHDropFormat()
 {
     static FORMATETC urlFormat = {CF_HDROP, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL};
@@ -83,7 +83,7 @@ static bool getDataMapItem(const DragDataMap* dataObject, FORMATETC* format, Str
 static bool getWebLocData(IDataObject* dataObject, String& url, String* title) 
 {
     bool succeeded = false;
-#if PLATFORM(CF)
+#if USE(CF)
     WCHAR filename[MAX_PATH];
     WCHAR urlBuffer[INTERNET_MAX_URL_LENGTH];
 
@@ -123,7 +123,7 @@ exit:
 
 static bool getWebLocData(const DragDataMap* dataObject, String& url, String* title) 
 {
-#if PLATFORM(CF)
+#if USE(CF)
     WCHAR filename[MAX_PATH];
     WCHAR urlBuffer[INTERNET_MAX_URL_LENGTH];
 
@@ -390,7 +390,7 @@ String getURL(IDataObject* dataObject, DragData::FilenameConversionPolicy filena
         ReleaseStgMedium(&store);
         success = true;
     }
-#if PLATFORM(CF)
+#if USE(CF)
     else if (filenamePolicy == DragData::ConvertFilenames) {
         if (SUCCEEDED(dataObject->GetData(filenameWFormat(), &store))) {
             // file using unicode
@@ -434,7 +434,7 @@ String getURL(const DragDataMap* data, DragData::FilenameConversionPolicy filena
         return extractURL(url, title);
     if (getDataMapItem(data, urlFormat(), url))
         return extractURL(url, title);
-#if PLATFORM(CF)
+#if USE(CF)
     if (filenamePolicy != DragData::ConvertFilenames)
         return url;
 
@@ -654,7 +654,7 @@ void getUtf8Data(IDataObject* data, FORMATETC* format, Vector<String>& dataStrin
     ReleaseStgMedium(&store);
 }
 
-#if PLATFORM(CF)
+#if USE(CF)
 void getCFData(IDataObject* data, FORMATETC* format, Vector<String>& dataStrings)
 {
     STGMEDIUM store;
@@ -710,7 +710,7 @@ void setUtf8Data(IDataObject* data, FORMATETC* format, const Vector<String>& dat
     ::GlobalFree(medium.hGlobal);
 }
 
-#if PLATFORM(CF)
+#if USE(CF)
 void setCFData(IDataObject* data, FORMATETC* format, const Vector<String>& dataStrings)
 {
     STGMEDIUM medium = {0};
@@ -738,7 +738,7 @@ static const ClipboardFormatMap& getClipboardMap()
         formatMap.add(texthtmlFormat()->cfFormat, new ClipboardDataItem(texthtmlFormat(), getStringData<UChar>, setUCharData));
         formatMap.add(plainTextFormat()->cfFormat,  new ClipboardDataItem(plainTextFormat(), getStringData<char>, setUtf8Data));
         formatMap.add(plainTextWFormat()->cfFormat,  new ClipboardDataItem(plainTextWFormat(), getStringData<UChar>, setUCharData));
-#if PLATFORM(CF)
+#if USE(CF)
         formatMap.add(cfHDropFormat()->cfFormat,  new ClipboardDataItem(cfHDropFormat(), getCFData, setCFData));
 #endif
         formatMap.add(filenameFormat()->cfFormat,  new ClipboardDataItem(filenameFormat(), getStringData<char>, setUtf8Data));
index c0af712..791ec86 100644 (file)
@@ -318,7 +318,7 @@ static HRESULT writeFileToDataObject(IDataObject* dataObject, HGLOBAL fileDescri
     if (FAILED(hr = dataObject->SetData(fe, &medium, TRUE)))
         goto exit;
 
-#if PLATFORM(CF)
+#if USE(CF)
     // HDROP
     if (hDropContent) {
         medium.hGlobal = hDropContent;
index 7ae800b..a5ca9b7 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <wtf/text/AtomicString.h>
 
-#if PLATFORM(CF)
+#if USE(CF)
 #include <wtf/RetainPtr.h>
 #endif
 
@@ -41,14 +41,14 @@ PopupMenu* SearchPopupMenuWin::popupMenu()
 
 bool SearchPopupMenuWin::enabled()
 {
-#if PLATFORM(CF)
+#if USE(CF)
     return true;
 #else
     return false;
 #endif
 }
 
-#if PLATFORM(CF)
+#if USE(CF)
 static RetainPtr<CFStringRef> autosaveKey(const String& name)
 {
     String key = "com.apple.WebKit.searchField:" + name;
@@ -61,7 +61,7 @@ void SearchPopupMenuWin::saveRecentSearches(const AtomicString& name, const Vect
     if (name.isEmpty())
         return;
 
-#if PLATFORM(CF)
+#if USE(CF)
     RetainPtr<CFMutableArrayRef> items;
 
     size_t size = searchItems.size();
@@ -83,7 +83,7 @@ void SearchPopupMenuWin::loadRecentSearches(const AtomicString& name, Vector<Str
     if (name.isEmpty())
         return;
 
-#if PLATFORM(CF)
+#if USE(CF)
     searchItems.clear();
     RetainPtr<CFArrayRef> items(AdoptCF, reinterpret_cast<CFArrayRef>(CFPreferencesCopyAppValue(autosaveKey(name).get(), kCFPreferencesCurrentApplication)));
 
index b418540..1826525 100644 (file)
@@ -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.
index b9afa1a..7fe7e5f 100644 (file)
 
 // 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
index 11e6b33..1a099fe 100644 (file)
@@ -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
+
+        * WebView.cpp:
+
 2011-02-22  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 
         Reviewed by Alexey Proskuryakov.
index b5ae92c..9663507 100644 (file)
 #include <CoreGraphics/CGContext.h>
 #endif
 
-#if PLATFORM(CF)
+#if USE(CF)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
index 454a24d..0e0632a 100644 (file)
@@ -1,3 +1,15 @@
+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
+
+        * UIProcess/WebBackForwardList.h:
+        * UIProcess/WebPageProxy.cpp:
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        (WebKit::formatLocalizedString):
+
 2011-02-23  Benjamin Poulain  <benjamin.poulain@nokia.com>
 
         Reviewed by Andreas Kling.
index 3376771..ead0fca 100644 (file)
@@ -33,7 +33,7 @@
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
-#if PLATFORM(CF)
+#if USE(CF)
 #include <CoreFoundation/CFDictionary.h>
 #endif
 
@@ -77,7 +77,7 @@ public:
     PassRefPtr<ImmutableArray> backListAsImmutableArrayWithLimit(unsigned limit);
     PassRefPtr<ImmutableArray> forwardListAsImmutableArrayWithLimit(unsigned limit);
 
-#if PLATFORM(CF)
+#if USE(CF)
     CFDictionaryRef createCFDictionaryRepresentation(WebPageProxy::WebPageProxySessionStateFilterCallback, void* context) const;
     bool restoreFromCFDictionaryRepresentation(CFDictionaryRef);
 #endif
index 51d4660..d4326a9 100644 (file)
@@ -960,7 +960,7 @@ void WebPageProxy::terminateProcess()
     process()->terminate();
 }
 
-#if !PLATFORM(CF) || defined(BUILDING_QT__)
+#if !USE(CF) || defined(BUILDING_QT__)
 PassRefPtr<WebData> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback, void* context) const
 {
     // FIXME: Return session state data for saving Page state.
index 8a3c377..a4e75e2 100644 (file)
@@ -38,7 +38,7 @@
 #include <wtf/MathExtras.h>
 #include <wtf/text/CString.h>
 
-#if PLATFORM(CF)
+#if USE(CF)
 #include <wtf/RetainPtr.h>
 #endif
 
@@ -57,7 +57,7 @@ namespace WebKit {
 // type according to section 18.7/3 of the C++ N1905 standard.
 static String formatLocalizedString(String format, ...)
 {
-#if PLATFORM(CF)
+#if USE(CF)
     va_list arguments;
     va_start(arguments, format);
     RetainPtr<CFStringRef> formatCFString(AdoptCF, format.createCFString());
index ab1999f..d74f8bc 100644 (file)
@@ -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
+
+        * DumpRenderTree/config.h:
+
 2011-02-23  Dirk Pranke  <dpranke@chromium.org>
 
         Reviewed by Ojan Vafai.
index 55e2dc1..351a2b1 100644 (file)
@@ -41,7 +41,7 @@
 #endif
 
 #if PLATFORM(MAC)
-#define WTF_PLATFORM_CF 1
+#define WTF_USE_CF 1
 
 #if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
 #define BUILDING_ON_TIGER 1
@@ -53,7 +53,7 @@
 #endif // PLATFORM(MAC)
 
 #if PLATFORM(WIN)
-#define WTF_PLATFORM_CF 1 
+#define WTF_USE_CF 1 
 #if defined(WIN_CAIRO)
 #define WTF_PLATFORM_CAIRO 1
 #define WTF_USE_CURL 1