Changeset 164357 in webkit

Timestamp:

Feb 18, 2014 10:15:59 PM (10 years ago)

Author:

mitz@apple.com

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).

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/Editor.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (modified) (2 diffs)
• WebKit2/Shared/Network/NetworkProcessCreationParameters.h (modified) (1 diff)
• WebKit2/WebKit2Prefix.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-02-18  Dan Bernstein  <mitz@apple.com>
+
+        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  <barraclough@apple.com>
 

trunk/Source/WTF/wtf/Platform.h

@@ -409 +409 @@
 /* PLATFORM(GTK) */
 /* PLATFORM(MAC) */
+/* PLATFORM(IOS) */
+/* PLATFORM(IOS_SIMULATOR) */
 /* PLATFORM(WIN) */
 #if defined(BUILDING_EFL__)
@@ -414 +416 @@
 #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
-#endif
-
-/* PLATFORM(IOS_SIMULATOR) */
-#if defined(TARGET_IPHONE_SIMULATOR) && TARGET_IPHONE_SIMULATOR
-#define WTF_PLATFORM_IOS 1
-#define WTF_PLATFORM_IOS_SIMULATOR 1
+/* PLATFORM(COCOA) */
+#if PLATFORM(MAC) || PLATFORM(IOS)
+#define WTF_PLATFORM_COCOA 1
 #endif
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-18  Dan Bernstein  <mitz@apple.com>
+
+        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  <barraclough@apple.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -563 +563 @@
 #endif
 
-#if !PLATFORM(MAC) && !PLATFORM(EFL)
+#if !PLATFORM(COCOA) && !PLATFORM(EFL)
 void Editor::pasteWithPasteboard(Pasteboard* pasteboard, bool allowPlainText)
 {

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-18  Dan Bernstein  <mitz@apple.com>
+
+        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  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp

@@ -47 +47 @@
     encoder << urlSchemesRegisteredForCustomProtocols;
 #endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     encoder << parentProcessName;
     encoder << uiProcessBundleIdentifier;
@@ -80 +80 @@
         return false;
 #endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     if (!decoder.decode(result.parentProcessName))
         return false;

trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h

@@ -63 +63 @@
 #endif
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
     String parentProcessName;
     String uiProcessBundleIdentifier;

trunk/Source/WebKit2/WebKit2Prefix.h

@@ -35 +35 @@
 #include <wtf/Platform.h>
 
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
 
 #if !PLATFORM(IOS)