Changeset 163291 in webkit

Timestamp:

Feb 3, 2014, 12:17:33 AM (11 years ago)

Author:

mitz@apple.com

Message:

Stop using PLATFORM(MAC) in JavaScriptCore except where it means “OS X but not iOS”
​https://bugs.webkit.org/show_bug.cgi?id=128098

Reviewed by Darin Adler.

• API/JSValueRef.cpp:

(JSValueUnprotect): Added an explicit !PLATFORM(IOS) in guards for the Evernote workaround,
which is only needed on OS X.

• API/tests/testapi.c:

(main): Changed PLATFORM(MAC)

PLATFORM(IOS) guards to OS(DARWIN), because they were

surrounding tests for code that is itself guarded by OS(DARWIN).

• runtime/Watchdog.h: Changed PLATFORM(MAC) to OS(DARWIN).

• tools/CodeProfiling.cpp:

(JSC::CodeProfiling::begin): Changed PLATFORM(MAC) to
OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK).
(JSC::CodeProfiling::end): Ditto.

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSValueRef.cpp (modified) (3 diffs)
• API/tests/testapi.c (modified) (5 diffs)
• ChangeLog (modified) (1 diff)
• runtime/Watchdog.h (modified) (2 diffs)
• tools/CodeProfiling.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/API/JSValueRef.cpp ¶

@@ -45 +45 @@
 #include <algorithm> // for std::min
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
 #include <mach-o/dyld.h>
 #endif
@@ -51 +51 @@
 using namespace JSC;
 
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
 static bool evernoteHackNeeded()
 {
@@ -444 +444 @@
 void JSValueUnprotect(JSContextRef ctx, JSValueRef value)
 {
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) && !PLATFORM(IOS)
     if ((!value || !ctx) && evernoteHackNeeded())
         return;

trunk/Source/JavaScriptCore/API/tests/testapi.c ¶

@@ -34 +34 @@
 #include <wtf/Assertions.h>
 
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if OS(DARWIN)
 #include <mach/mach.h>
 #include <mach/mach_time.h>
@@ -1104 +1104 @@
 }
 
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if OS(DARWIN)
 static double currentCPUTime()
 {
@@ -1163 +1163 @@
     return true;
 }
-#endif /* PLATFORM(MAC) || PLATFORM(IOS) */
+#endif /* OS(DARWIN) */
 
 
@@ -1854 +1854 @@
     }
 
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if OS(DARWIN)
     JSStringRef currentCPUTimeStr = JSStringCreateWithUTF8CString("currentCPUTime");
     JSObjectRef currentCPUTimeFunction = JSObjectMakeFunctionWithCallback(context, currentCPUTimeStr, currentCPUTime_callAsFunction);
@@ -2005 +2005 @@
         }
     }
-#endif /* PLATFORM(MAC) || PLATFORM(IOS) */
+#endif /* OS(DARWIN) */
 
     // Clear out local variables pointing at JSObjectRefs to allow their values to be collected

trunk/Source/JavaScriptCore/ChangeLog ¶

@@ +1 @@
+2014-02-03  Dan Bernstein  <mitz@apple.com>
+
+        Stop using PLATFORM(MAC) in JavaScriptCore except where it means “OS X but not iOS”
+        https://bugs.webkit.org/show_bug.cgi?id=128098
+
+        Reviewed by Darin Adler.
+
+        * API/JSValueRef.cpp:
+        (JSValueUnprotect): Added an explicit !PLATFORM(IOS) in guards for the Evernote workaround,
+        which is only needed on OS X.
+
+        * API/tests/testapi.c:
+        (main): Changed PLATFORM(MAC) || PLATFORM(IOS) guards to OS(DARWIN), because they were
+        surrounding tests for code that is itself guarded by OS(DARWIN).
+
+        * runtime/Watchdog.h: Changed PLATFORM(MAC) to OS(DARWIN).
+
+        * tools/CodeProfiling.cpp:
+        (JSC::CodeProfiling::begin): Changed PLATFORM(MAC) to
+        OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK).
+        (JSC::CodeProfiling::end): Ditto.
+
 2014-02-02  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/runtime/Watchdog.h ¶

@@ -27 +27 @@
 #define Watchdog_h
 
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if OS(DARWIN)
 #include <dispatch/dispatch.h>    
 #endif
@@ -94 +94 @@
     void* m_callbackData2;
 
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if OS(DARWIN)
     dispatch_queue_t m_queue;
     dispatch_source_t m_timer;

trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp ¶

@@ -49 +49 @@
 #endif
 
-#if (PLATFORM(MAC) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
+#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
 // Helper function to start & stop the timer.
 // Presently we're using the wall-clock timer, since this seems to give the best results.
@@ -67 +67 @@
 #endif
 
-#if PLATFORM(MAC) && CPU(X86_64)
+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)
 static void profilingTimer(int, siginfo_t*, void* uap)
 {
@@ -144 +144 @@
         return;
 
-#if (PLATFORM(MAC) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
+#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
     // Regsiter a signal handler & itimer.
     struct sigaction action;
@@ -168 +168 @@
         return;
 
-#if (PLATFORM(MAC) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
+#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
     // Stop profiling
     setProfileTimer(0);