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
+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.
#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)
{
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
-#if PLATFORM(CF)
+#if USE(CF)
#include <CoreFoundation/CoreFoundation.h>
#endif
void operator()();
void synchronize();
-#if PLATFORM(CF)
+#if USE(CF)
protected:
DefaultGCActivityCallback(Heap*, CFRunLoopRef);
void commonConstructor(Heap*, CFRunLoopRef);
#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
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) {
#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
#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
#include "TypeTraits.h"
#include <algorithm>
-#if PLATFORM(CF)
+#if USE(CF)
#include <CoreFoundation/CoreFoundation.h>
#endif
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
#include <wtf/text/StringImplBase.h>
#include <wtf/unicode/Unicode.h>
-#if PLATFORM(CF)
+#if USE(CF)
typedef const struct __CFString * CFStringRef;
#endif
WTF::Unicode::Direction defaultWritingDirection(bool* hasStrongDirectionality = 0);
-#if PLATFORM(CF)
+#if USE(CF)
CFStringRef createCFString();
#endif
#ifdef __OBJC__
#include <objc/objc.h>
#endif
-#if PLATFORM(CF)
+#if USE(CF)
typedef const struct __CFString * CFStringRef;
#endif
operator UnspecifiedBoolTypeA() const;
operator UnspecifiedBoolTypeB() const;
-#if PLATFORM(CF)
+#if USE(CF)
String(CFStringRef);
CFStringRef createCFString() const;
#endif
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());
+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.
# 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/'],
#include "config.h"
#include "SmartReplace.h"
-#if !PLATFORM(CF) && !USE(ICU_UNICODE)
+#if !USE(CF) && !USE(ICU_UNICODE)
namespace WebCore {
}
-#endif // !PLATFORM(CF)
+#endif // !USE(CF)
#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>
}
-#endif // !PLATFORM(CF) && USE(ICU_UNICODE)
+#endif // !USE(CF) && USE(ICU_UNICODE)
// 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
// 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
{
// 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
// 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
#include "MIMETypeRegistry.h"
#include "PlatformString.h"
-#if PLATFORM(CF) && !PLATFORM(QT)
+#if USE(CF) && !PLATFORM(QT)
#include "LegacyWebArchive.h"
#endif
if (initialized)
return mimeTypes;
-#if PLATFORM(CF)
+#if USE(CF)
mimeTypes.set("application/x-webarchive", archiveFactoryCreate<LegacyWebArchive>);
#endif
#include <wtf/Forward.h>
#include <wtf/Vector.h>
-#if PLATFORM(CF)
+#if USE(CF)
#include <wtf/RetainPtr.h>
#endif
#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
#endif
#elif PLATFORM(GTK)
typedef GModule* PlatformModule;
-#elif PLATFORM(CF)
+#elif USE(CF)
typedef CFBundleRef PlatformModule;
#else
typedef void* 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
#include "URLString.h"
#include <wtf/HashMap.h>
-#if PLATFORM(CF)
+#if USE(CF)
typedef const struct __CFURL* CFURLRef;
#endif
unsigned pathAfterLastSlash() const;
operator const String&() const { return string(); }
-#if PLATFORM(CF)
+#if USE(CF)
KURL(CFURLRef);
CFURLRef createCFURL() const;
#endif
m_url.setAscii(canonicalSpec);
}
-#if PLATFORM(CF)
+#if USE(CF)
KURL::KURL(CFURLRef)
{
notImplemented();
virtual void fired() = 0;
private:
-#if PLATFORM(CF)
+#if USE(CF)
RetainPtr<CFRunLoopTimerRef> m_timer;
#endif
};
return segment == segments - 1 ? segmentedSize - position : segmentSize - positionInSegment;
}
-#if !PLATFORM(CF) || PLATFORM(QT)
+#if !USE(CF) || PLATFORM(QT)
inline void SharedBuffer::clearPlatformData()
{
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
-#if PLATFORM(CF)
+#if USE(CF)
#include <wtf/RetainPtr.h>
#endif
NSData *createNSData();
static PassRefPtr<SharedBuffer> wrapNSData(NSData *data);
#endif
-#if PLATFORM(CF)
+#if USE(CF)
CFDataRef createCFData();
static PassRefPtr<SharedBuffer> wrapCFData(CFDataRef);
#endif
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
#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
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);
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));
typedef struct _SoupSession SoupSession;
#endif
-#if PLATFORM(CF)
+#if USE(CF)
typedef const struct __CFData * CFDataRef;
#endif
#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
#if PLATFORM(MAC)
void createNSURLConnection(id delegate, bool shouldUseCredentialStorage, bool shouldContentSniff);
-#elif PLATFORM(CF)
+#elif USE(CF)
void createCFURLConnection(bool shouldUseCredentialStorage, bool shouldContentSniff);
#endif
unsigned initializeMaximumHTTPConnectionCountPerHost();
-#if PLATFORM(CF)
+#if USE(CF)
bool isHTTPPipeliningEnabled();
bool shouldForceHTTPPipeliningPriorityHigh();
#else
#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
return false;
}
-#if PLATFORM(WIN) && PLATFORM(CF)
+#if PLATFORM(WIN) && USE(CF)
static HashSet<String>& allowsAnyHTTPSCertificateHosts()
{
static HashSet<String> hosts;
}
#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()
#include <errno.h>
#include <stdio.h>
-#if PLATFORM(CF)
+#if USE(CF)
#include <wtf/RetainPtr.h>
#endif
#include <wtf/Threading.h>
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")));
#include "config.h"
#include "PlatformString.h"
-#if PLATFORM(CF)
+#if USE(CF)
#include <CoreFoundation/CoreFoundation.h>
}
-#endif // PLATFORM(CF)
+#endif // USE(CF)
#include "config.h"
#include <wtf/text/StringImpl.h>
-#if PLATFORM(CF)
+#if USE(CF)
#include <CoreFoundation/CoreFoundation.h>
#include <wtf/MainThread.h>
}
-#endif // PLATFORM(CF)
+#endif // USE(CF)
#include <windows.h>
#include <wtf/text/AtomicString.h>
-#if PLATFORM(CF)
+#if USE(CF)
#include <CoreFoundation/CoreFoundation.h>
#endif
m_bstr = SysAllocStringLen(s.characters(), s.length());
}
-#if PLATFORM(CF)
+#if USE(CF)
BString::BString(CFStringRef cfstr)
: m_bstr(0)
{
#include <wtf/Forward.h>
-#if PLATFORM(CF)
+#if USE(CF)
typedef const struct __CFString * CFStringRef;
#endif
BString(const AtomicString&);
BString(const KURL&);
BString(const JSC::UString&);
-#if PLATFORM(CF)
+#if USE(CF)
BString(CFStringRef);
#endif
~BString();
#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};
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];
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];
ReleaseStgMedium(&store);
success = true;
}
-#if PLATFORM(CF)
+#if USE(CF)
else if (filenamePolicy == DragData::ConvertFilenames) {
if (SUCCEEDED(dataObject->GetData(filenameWFormat(), &store))) {
// file using unicode
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;
ReleaseStgMedium(&store);
}
-#if PLATFORM(CF)
+#if USE(CF)
void getCFData(IDataObject* data, FORMATETC* format, Vector<String>& dataStrings)
{
STGMEDIUM store;
::GlobalFree(medium.hGlobal);
}
-#if PLATFORM(CF)
+#if USE(CF)
void setCFData(IDataObject* data, FORMATETC* format, const Vector<String>& dataStrings)
{
STGMEDIUM medium = {0};
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));
if (FAILED(hr = dataObject->SetData(fe, &medium, TRUE)))
goto exit;
-#if PLATFORM(CF)
+#if USE(CF)
// HDROP
if (hDropContent) {
medium.hGlobal = hDropContent;
#include <wtf/text/AtomicString.h>
-#if PLATFORM(CF)
+#if USE(CF)
#include <wtf/RetainPtr.h>
#endif
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;
if (name.isEmpty())
return;
-#if PLATFORM(CF)
+#if USE(CF)
RetainPtr<CFMutableArrayRef> items;
size_t size = searchItems.size();
if (name.isEmpty())
return;
-#if PLATFORM(CF)
+#if USE(CF)
searchItems.clear();
RetainPtr<CFArrayRef> items(AdoptCF, reinterpret_cast<CFArrayRef>(CFPreferencesCopyAppValue(autosaveKey(name).get(), kCFPreferencesCurrentApplication)));
+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.
// 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
+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.
#include <CoreGraphics/CGContext.h>
#endif
-#if PLATFORM(CF)
+#if USE(CF)
#include <CoreFoundation/CoreFoundation.h>
#endif
+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.
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
-#if PLATFORM(CF)
+#if USE(CF)
#include <CoreFoundation/CFDictionary.h>
#endif
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
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.
#include <wtf/MathExtras.h>
#include <wtf/text/CString.h>
-#if PLATFORM(CF)
+#if USE(CF)
#include <wtf/RetainPtr.h>
#endif
// 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());
+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.
#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
#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
git://git.webkit.org / WebKit-https.git / commitdiff