Use correct runloop type in the WebContent process.
authorpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 May 2018 02:22:02 +0000 (02:22 +0000)
committerpvollan@apple.com <pvollan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 May 2018 02:22:02 +0000 (02:22 +0000)
https://bugs.webkit.org/show_bug.cgi?id=185140
<rdar://problem/39585037>

Reviewed by Brent Fulgham.

The macOS target version should be used to determine the runloop type.

* Configurations/WebContentService.xcconfig:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231192 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/Configurations/WebContentService.xcconfig

index b25ea9a..b676465 100644 (file)
@@ -1,3 +1,15 @@
+2018-04-30  Per Arne Vollan  <pvollan@apple.com>
+
+        Use correct runloop type in the WebContent process.
+        https://bugs.webkit.org/show_bug.cgi?id=185140
+        <rdar://problem/39585037>
+
+        Reviewed by Brent Fulgham.
+
+        The macOS target version should be used to determine the runloop type.
+
+        * Configurations/WebContentService.xcconfig:
+
 2018-04-30  Michael Saboff  <msaboff@apple.com>
 
         Eliminate WebProcessShim.dylib
index bfd1556..58fd2ba 100644 (file)
@@ -60,7 +60,9 @@ WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG_ = $(WK_WEBCONTENT_S
 WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG_NO = $(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG);
 WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG_YES = $(USE_STAGING_INSTALL_PATH);
 
-RUNLOOP_TYPE[sdk=macosx*] = NSRunLoop;
-RUNLOOP_TYPE[sdk=macosx10.13*] = _NSApplicationMain;
-RUNLOOP_TYPE[sdk=macosx10.12*] = _NSApplicationMain;
-RUNLOOP_TYPE[sdk=macosx10.11*] = _NSApplicationMain;
+RUNLOOP_TYPE = $(RUNLOOP_TYPE_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+RUNLOOP_TYPE_macosx_101100 = _NSApplicationMain;
+RUNLOOP_TYPE_macosx_101200 = _NSApplicationMain;
+RUNLOOP_TYPE_macosx_101300 = _NSApplicationMain;
+RUNLOOP_TYPE_macosx_101400 = NSRunLoop;
+RUNLOOP_TYPE_macosx_101500 = NSRunLoop;