Title: [108247] trunk/Source/WebCore
- Revision
- 108247
- Author
- [email protected]
- Date
- 2012-02-20 09:11:44 -0800 (Mon, 20 Feb 2012)
Log Message
[WIN] Allow compiling FileSystem without CoreFoundation.
https://bugs.webkit.org/show_bug.cgi?id=79032
Reviewed by Adam Roben.
Add #if USE(CF) around code using the CoreFoundation functions.
* platform/FileSystem.h:
* platform/win/FileSystemWin.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (108246 => 108247)
--- trunk/Source/WebCore/ChangeLog 2012-02-20 16:57:51 UTC (rev 108246)
+++ trunk/Source/WebCore/ChangeLog 2012-02-20 17:11:44 UTC (rev 108247)
@@ -1,3 +1,15 @@
+2012-02-20 Patrick Gansterer <[email protected]>
+
+ [WIN] Allow compiling FileSystem without CoreFoundation.
+ https://bugs.webkit.org/show_bug.cgi?id=79032
+
+ Reviewed by Adam Roben.
+
+ Add #if USE(CF) around code using the CoreFoundation functions.
+
+ * platform/FileSystem.h:
+ * platform/win/FileSystemWin.cpp:
+
2012-02-20 Robin Cao <[email protected]>
[BlackBerry] Upstream the first few files in platform/graphics/blackberry
Modified: trunk/Source/WebCore/platform/FileSystem.h (108246 => 108247)
--- trunk/Source/WebCore/platform/FileSystem.h 2012-02-20 16:57:51 UTC (rev 108246)
+++ trunk/Source/WebCore/platform/FileSystem.h 2012-02-20 17:11:44 UTC (rev 108247)
@@ -205,6 +205,9 @@
#if PLATFORM(WIN) && !OS(WINCE)
String localUserSpecificStorageDirectory();
String roamingUserSpecificStorageDirectory();
+#endif
+
+#if PLATFORM(WIN) && USE(CF)
bool safeCreateFile(const String&, CFDataRef);
#endif
Modified: trunk/Source/WebCore/platform/win/FileSystemWin.cpp (108246 => 108247)
--- trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2012-02-20 16:57:51 UTC (rev 108246)
+++ trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2012-02-20 17:11:44 UTC (rev 108247)
@@ -145,9 +145,11 @@
static String bundleName()
{
- static bool initialized;
static String name = "WebKit";
+#if USE(CF)
+ static bool initialized;
+
if (!initialized) {
initialized = true;
@@ -156,6 +158,7 @@
if (CFGetTypeID(bundleExecutable) == CFStringGetTypeID())
name = reinterpret_cast<CFStringRef>(bundleExecutable);
}
+#endif
return name;
}
@@ -291,6 +294,8 @@
return cachedStorageDirectory(CSIDL_APPDATA);
}
+#if USE(CF)
+
bool safeCreateFile(const String& path, CFDataRef data)
{
// Create a temporary file.
@@ -321,6 +326,8 @@
return true;
}
+#endif // USE(CF)
+
Vector<String> listDirectory(const String& directory, const String& filter)
{
Vector<String> entries;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
