Title: [164357] trunk/Source
- Revision
- 164357
- Author
- [email protected]
- Date
- 2014-02-18 22:15:59 -0800 (Tue, 18 Feb 2014)
Log Message
PLATFORM(MAC) is true when building for iOS
https://bugs.webkit.org/show_bug.cgi?id=129025
Reviewed by Mark Rowe.
Source/WebCore:
* editing/Editor.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA) now that the former does not
include iOS.
Source/WebKit2:
* Shared/Network/NetworkProcessCreationParameters.cpp: Changed PLATFORM(MAC) to
PLATFORM(COCOA) now that the former does not include iOS.
(WebKit::NetworkProcessCreationParameters::encode):
(WebKit::NetworkProcessCreationParameters::decode):
* Shared/Network/NetworkProcessCreationParameters.h: Ditto.
* WebKit2Prefix.h: Ditto.
Source/WTF:
* wtf/Platform.h: Changed to define WTF_PLATFORM_MAC only on when building for OS X (but
still not when WTF_PLATFORM_GTK or WTF_PLATFORM_EFL are defined).
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (164356 => 164357)
--- trunk/Source/WTF/ChangeLog 2014-02-19 06:12:50 UTC (rev 164356)
+++ trunk/Source/WTF/ChangeLog 2014-02-19 06:15:59 UTC (rev 164357)
@@ -1,3 +1,13 @@
+2014-02-18 Dan Bernstein <[email protected]>
+
+ PLATFORM(MAC) is true when building for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=129025
+
+ Reviewed by Mark Rowe.
+
+ * wtf/Platform.h: Changed to define WTF_PLATFORM_MAC only on when building for OS X (but
+ still not when WTF_PLATFORM_GTK or WTF_PLATFORM_EFL are defined).
+
2014-02-17 Gavin Barraclough <[email protected]>
Add fast mapping from StringImpl to JSString
Modified: trunk/Source/WTF/wtf/Platform.h (164356 => 164357)
--- trunk/Source/WTF/wtf/Platform.h 2014-02-19 06:12:50 UTC (rev 164356)
+++ trunk/Source/WTF/wtf/Platform.h 2014-02-19 06:15:59 UTC (rev 164357)
@@ -408,30 +408,29 @@
/* PLATFORM(EFL) */
/* PLATFORM(GTK) */
/* PLATFORM(MAC) */
+/* PLATFORM(IOS) */
+/* PLATFORM(IOS_SIMULATOR) */
/* PLATFORM(WIN) */
#if defined(BUILDING_EFL__)
#define WTF_PLATFORM_EFL 1
#elif defined(BUILDING_GTK__)
#define WTF_PLATFORM_GTK 1
-#elif OS(DARWIN)
-#define WTF_PLATFORM_COCOA 1
+#elif OS(MAC_OS_X)
#define WTF_PLATFORM_MAC 1
+#elif OS(IOS)
+#define WTF_PLATFORM_IOS 1
+#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
+#define WTF_PLATFORM_IOS_SIMULATOR 1
+#endif
#elif OS(WINDOWS)
#define WTF_PLATFORM_WIN 1
#endif
-/* PLATFORM(IOS) */
-/* FIXME: this is sometimes used as an OS switch and sometimes for higher-level things */
-#if (defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
-#define WTF_PLATFORM_IOS 1
+/* PLATFORM(COCOA) */
+#if PLATFORM(MAC) || PLATFORM(IOS)
+#define WTF_PLATFORM_COCOA 1
#endif
-/* PLATFORM(IOS_SIMULATOR) */
-#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
-#define WTF_PLATFORM_IOS 1
-#define WTF_PLATFORM_IOS_SIMULATOR 1
-#endif
-
/* Graphics engines */
/* USE(CG) and PLATFORM(CI) */
Modified: trunk/Source/WebCore/ChangeLog (164356 => 164357)
--- trunk/Source/WebCore/ChangeLog 2014-02-19 06:12:50 UTC (rev 164356)
+++ trunk/Source/WebCore/ChangeLog 2014-02-19 06:15:59 UTC (rev 164357)
@@ -1,3 +1,13 @@
+2014-02-18 Dan Bernstein <[email protected]>
+
+ PLATFORM(MAC) is true when building for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=129025
+
+ Reviewed by Mark Rowe.
+
+ * editing/Editor.cpp: Changed PLATFORM(MAC) to PLATFORM(COCOA) now that the former does not
+ include iOS.
+
2014-02-17 Gavin Barraclough <[email protected]>
Add fast mapping from StringImpl to JSString
Modified: trunk/Source/WebCore/editing/Editor.cpp (164356 => 164357)
--- trunk/Source/WebCore/editing/Editor.cpp 2014-02-19 06:12:50 UTC (rev 164356)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-02-19 06:15:59 UTC (rev 164357)
@@ -562,7 +562,7 @@
#endif
-#if !PLATFORM(MAC) && !PLATFORM(EFL)
+#if !PLATFORM(COCOA) && !PLATFORM(EFL)
void Editor::pasteWithPasteboard(Pasteboard* pasteboard, bool allowPlainText)
{
RefPtr<Range> range = selectedRange();
Modified: trunk/Source/WebKit2/ChangeLog (164356 => 164357)
--- trunk/Source/WebKit2/ChangeLog 2014-02-19 06:12:50 UTC (rev 164356)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-19 06:15:59 UTC (rev 164357)
@@ -1,3 +1,17 @@
+2014-02-18 Dan Bernstein <[email protected]>
+
+ PLATFORM(MAC) is true when building for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=129025
+
+ Reviewed by Mark Rowe.
+
+ * Shared/Network/NetworkProcessCreationParameters.cpp: Changed PLATFORM(MAC) to
+ PLATFORM(COCOA) now that the former does not include iOS.
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h: Ditto.
+ * WebKit2Prefix.h: Ditto.
+
2014-02-18 Simon Fraser <[email protected]>
Clean up WKContentView initialization
Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (164356 => 164357)
--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-02-19 06:12:50 UTC (rev 164356)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2014-02-19 06:15:59 UTC (rev 164357)
@@ -46,7 +46,7 @@
#if ENABLE(CUSTOM_PROTOCOLS)
encoder << urlSchemesRegisteredForCustomProtocols;
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
encoder << parentProcessName;
encoder << uiProcessBundleIdentifier;
encoder << nsURLCacheMemoryCapacity;
@@ -79,7 +79,7 @@
if (!decoder.decode(result.urlSchemesRegisteredForCustomProtocols))
return false;
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
if (!decoder.decode(result.parentProcessName))
return false;
if (!decoder.decode(result.uiProcessBundleIdentifier))
Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (164356 => 164357)
--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-02-19 06:12:50 UTC (rev 164356)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2014-02-19 06:15:59 UTC (rev 164357)
@@ -62,7 +62,7 @@
Vector<String> urlSchemesRegisteredForCustomProtocols;
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
String parentProcessName;
String uiProcessBundleIdentifier;
uint64_t nsURLCacheMemoryCapacity;
Modified: trunk/Source/WebKit2/WebKit2Prefix.h (164356 => 164357)
--- trunk/Source/WebKit2/WebKit2Prefix.h 2014-02-19 06:12:50 UTC (rev 164356)
+++ trunk/Source/WebKit2/WebKit2Prefix.h 2014-02-19 06:15:59 UTC (rev 164357)
@@ -34,7 +34,7 @@
#include <wtf/Platform.h>
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#if !PLATFORM(IOS)
#define ENABLE_WEB_PROCESS_SANDBOX 1
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
