Diff
Modified: trunk/Source/WebCore/ChangeLog (239908 => 239909)
--- trunk/Source/WebCore/ChangeLog 2019-01-13 21:45:35 UTC (rev 239908)
+++ trunk/Source/WebCore/ChangeLog 2019-01-13 23:13:46 UTC (rev 239909)
@@ -1,3 +1,11 @@
+2019-01-13 Dan Bernstein <[email protected]>
+
+ Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901.
+
+ Patch by Keith Rollin.
+
+ * accessibility/mac/AXObjectCacheMac.mm:
+
2019-01-13 Zalan Bujtas <[email protected]>
[LFC] Adjust assert for statically positioned fixed elements
Modified: trunk/Source/WebCore/PAL/ChangeLog (239908 => 239909)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-01-13 21:45:35 UTC (rev 239908)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-01-13 23:13:46 UTC (rev 239909)
@@ -1,3 +1,14 @@
+2019-01-13 Dan Bernstein <[email protected]>
+
+ Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901.
+
+ Patch by Keith Rollin.
+
+ * pal/spi/cocoa/LaunchServicesSPI.h:
+ * pal/spi/mac/HIServicesSPI.h:
+ * pal/spi/mac/MetadataSPI.h:
+ * pal/spi/mac/SpeechSynthesisSPI.h:
+
2019-01-12 Timothy Hatcher <[email protected]>
Have prefers-color-scheme: light always match on macOS versions before Mojave.
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h (239908 => 239909)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h 2019-01-13 21:45:35 UTC (rev 239908)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h 2019-01-13 23:13:46 UTC (rev 239909)
@@ -30,7 +30,7 @@
#if USE(APPLE_INTERNAL_SDK)
#if PLATFORM(MAC)
-#import <LaunchServices/LaunchServicesPriv.h>
+#import <CoreServices/CoreServicesPriv.h>
#elif PLATFORM(IOS_FAMILY)
#import <MobileCoreServices/LSAppLinkPriv.h>
#endif
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h (239908 => 239909)
--- trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h 2019-01-13 21:45:35 UTC (rev 239908)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h 2019-01-13 23:13:46 UTC (rev 239909)
@@ -29,9 +29,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <HIServices/AXTextMarker.h>
-#include <HIServices/CoreCursor.h>
-#include <HIServices/CoreDrag.h>
+#include <ApplicationServices/ApplicationServicesPriv.h>
#else
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h (239908 => 239909)
--- trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h 2019-01-13 21:45:35 UTC (rev 239908)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h 2019-01-13 23:13:46 UTC (rev 239909)
@@ -27,7 +27,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <Metadata/MetadataPriv.h>
+#include <CoreServices/CoreServicesPriv.h>
#endif
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h (239908 => 239909)
--- trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h 2019-01-13 21:45:35 UTC (rev 239908)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h 2019-01-13 23:13:46 UTC (rev 239909)
@@ -27,7 +27,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#include <SpeechSynthesis/SpeechSynthesisPriv.h>
+#include <ApplicationServices/ApplicationServicesPriv.h>
#endif
Modified: trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (239908 => 239909)
--- trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2019-01-13 21:45:35 UTC (rev 239908)
+++ trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2019-01-13 23:13:46 UTC (rev 239909)
@@ -35,7 +35,7 @@
#import <pal/spi/mac/NSAccessibilitySPI.h>
#if USE(APPLE_INTERNAL_SDK)
-#include <HIServices/AccessibilityPriv.h>
+#include <ApplicationServices/ApplicationServicesPriv.h>
#endif
#ifndef NSAccessibilityLiveRegionChangedNotification
Modified: trunk/Source/WebKit/ChangeLog (239908 => 239909)
--- trunk/Source/WebKit/ChangeLog 2019-01-13 21:45:35 UTC (rev 239908)
+++ trunk/Source/WebKit/ChangeLog 2019-01-13 23:13:46 UTC (rev 239909)
@@ -1,3 +1,13 @@
+2019-01-13 Dan Bernstein <[email protected]>
+
+ Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901.
+
+ Patch by Keith Rollin.
+
+ * Platform/IPC/mac/ConnectionMac.mm:
+ * Shared/mac/ChildProcessMac.mm:
+ (WebKit::ChildProcess::launchServicesCheckIn):
+
2019-01-12 Timothy Hatcher <[email protected]>
Have prefers-color-scheme: light always match on macOS versions before Mojave.
Modified: trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm (239908 => 239909)
--- trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm 2019-01-13 21:45:35 UTC (rev 239908)
+++ trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm 2019-01-13 23:13:46 UTC (rev 239909)
@@ -56,7 +56,7 @@
#if PLATFORM(MAC)
#if USE(APPLE_INTERNAL_SDK)
-#import <HIServices/AccessibilityPriv.h>
+#import <ApplicationServices/ApplicationServicesPriv.h>
#else
typedef enum {
AXSuspendStatusRunning = 0,
Modified: trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm (239908 => 239909)
--- trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm 2019-01-13 21:45:35 UTC (rev 239908)
+++ trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm 2019-01-13 23:13:46 UTC (rev 239909)
@@ -41,6 +41,7 @@
#import <mach/mach.h>
#import <mach/task.h>
#import <pal/crypto/CryptoDigest.h>
+#import <pal/spi/cocoa/LaunchServicesSPI.h>
#import <pwd.h>
#import <stdlib.h>
#import <sys/sysctl.h>
@@ -55,7 +56,7 @@
#import <wtf/text/StringBuilder.h>
#if USE(APPLE_INTERNAL_SDK)
-#import <HIServices/ProcessesPriv.h>
+#import <ApplicationServices/ApplicationServicesPriv.h>
#import <rootless.h>
#endif
@@ -67,7 +68,7 @@
typedef bool (^LSServerConnectionAllowedBlock) ( CFDictionaryRef optionsRef );
extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);
-extern "C" CFDictionaryRef _LSApplicationCheckIn(int sessionID, CFDictionaryRef applicationInfo);
+extern "C" CFDictionaryRef _LSApplicationCheckIn(LSSessionID sessionID, CFDictionaryRef applicationInfo);
extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon);
@@ -158,7 +159,7 @@
void ChildProcess::launchServicesCheckIn()
{
_LSSetApplicationLaunchServicesServerConnectionStatus(0, 0);
- RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(-2, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
+ RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(kLSDefaultSessionID, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
}
void ChildProcess::platformInitialize()
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (239908 => 239909)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-01-13 21:45:35 UTC (rev 239908)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-01-13 23:13:46 UTC (rev 239909)
@@ -1,3 +1,11 @@
+2019-01-13 Dan Bernstein <[email protected]>
+
+ Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901.
+
+ Patch by Keith Rollin.
+
+ * WebView/PDFViewSPI.h:
+
2019-01-12 Timothy Hatcher <[email protected]>
Have prefers-color-scheme: light always match on macOS versions before Mojave.
Modified: trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h (239908 => 239909)
--- trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h 2019-01-13 21:45:35 UTC (rev 239908)
+++ trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h 2019-01-13 23:13:46 UTC (rev 239909)
@@ -25,7 +25,7 @@
#if USE(APPLE_INTERNAL_SDK)
-#import <PDFKit/PDFViewPriv.h>
+#import <Quartz/QuartzPrivate.h>
#else
