Skip to content
Permalink
Browse files
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:


Canonical link: https://commits.webkit.org/200645@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231192 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
pvollan committed May 1, 2018
1 parent 4cbc4e9 commit 1e3bd3b9b352a5e7618f4c72a7b9165a47384af0
Showing with 18 additions and 4 deletions.
  1. +12 −0 Source/WebKit/ChangeLog
  2. +6 −4 Source/WebKit/Configurations/WebContentService.xcconfig
@@ -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
@@ -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;

0 comments on commit 1e3bd3b

Please sign in to comment.