Changeset 239909 in webkit


Ignore:
Timestamp:
Jan 13, 2019 3:13:46 PM (5 years ago)
Author:
mitz@apple.com
Message:

Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901.

Patch by Keith Rollin.

Source/WebCore:

  • accessibility/mac/AXObjectCacheMac.mm:

Source/WebCore/PAL:

  • pal/spi/cocoa/LaunchServicesSPI.h:
  • pal/spi/mac/HIServicesSPI.h:
  • pal/spi/mac/MetadataSPI.h:
  • pal/spi/mac/SpeechSynthesisSPI.h:

Source/WebKit:

  • Platform/IPC/mac/ConnectionMac.mm:
  • Shared/mac/ChildProcessMac.mm:

(WebKit::ChildProcess::launchServicesCheckIn):

Source/WebKitLegacy/mac:

  • WebView/PDFViewSPI.h:
Location:
trunk/Source
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r239907 r239909  
     12019-01-13  Dan Bernstein  <mitz@apple.com>
     2
     3        Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901.
     4
     5        Patch by Keith Rollin.
     6
     7        * accessibility/mac/AXObjectCacheMac.mm:
     8
    192019-01-13  Zalan Bujtas  <zalan@apple.com>
    210

  • trunk/Source/WebCore/PAL/ChangeLog

    r239904 r239909  
     12019-01-13  Dan Bernstein  <mitz@apple.com>
     2
     3        Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901.
     4
     5        Patch by Keith Rollin.
     6
     7        * pal/spi/cocoa/LaunchServicesSPI.h:
     8        * pal/spi/mac/HIServicesSPI.h:
     9        * pal/spi/mac/MetadataSPI.h:
     10        * pal/spi/mac/SpeechSynthesisSPI.h:
     11
    1122019-01-12  Timothy Hatcher  <timothy@apple.com>
    213

  • trunk/Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h

    r238289 r239909  
    3131
    3232#if PLATFORM(MAC)
    33 #import <LaunchServices/LaunchServicesPriv.h>
     33#import <CoreServices/CoreServicesPriv.h>
    3434#elif PLATFORM(IOS_FAMILY)
    3535#import <MobileCoreServices/LSAppLinkPriv.h>

  • trunk/Source/WebCore/PAL/pal/spi/mac/HIServicesSPI.h

    r239033 r239909  
    3030#if USE(APPLE_INTERNAL_SDK)
    3131
    32 #include <HIServices/AXTextMarker.h>
    33 #include <HIServices/CoreCursor.h>
    34 #include <HIServices/CoreDrag.h>
     32#include <ApplicationServices/ApplicationServicesPriv.h>
    3533
    3634#else

  • trunk/Source/WebCore/PAL/pal/spi/mac/MetadataSPI.h

    r232239 r239909  
    2828#if USE(APPLE_INTERNAL_SDK)
    2929
    30 #include <Metadata/MetadataPriv.h>
     30#include <CoreServices/CoreServicesPriv.h>
    3131
    3232#endif

  • trunk/Source/WebCore/PAL/pal/spi/mac/SpeechSynthesisSPI.h

    r232239 r239909  
    2828#if USE(APPLE_INTERNAL_SDK)
    2929
    30 #include <SpeechSynthesis/SpeechSynthesisPriv.h>
     30#include <ApplicationServices/ApplicationServicesPriv.h>
    3131
    3232#endif

  • trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm

    r235935 r239909  
    3636
    3737#if USE(APPLE_INTERNAL_SDK)
    38 #include <HIServices/AccessibilityPriv.h>
     38#include <ApplicationServices/ApplicationServicesPriv.h>
    3939#endif
    4040

  • trunk/Source/WebKit/ChangeLog

    r239904 r239909  
     12019-01-13  Dan Bernstein  <mitz@apple.com>
     2
     3        Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901.
     4
     5        Patch by Keith Rollin.
     6
     7        * Platform/IPC/mac/ConnectionMac.mm:
     8        * Shared/mac/ChildProcessMac.mm:
     9        (WebKit::ChildProcess::launchServicesCheckIn):
     10
    1112019-01-12  Timothy Hatcher  <timothy@apple.com>
    212

  • trunk/Source/WebKit/Platform/IPC/mac/ConnectionMac.mm

    r239792 r239909  
    5757
    5858#if USE(APPLE_INTERNAL_SDK)
    59 #import <HIServices/AccessibilityPriv.h>
     59#import <ApplicationServices/ApplicationServicesPriv.h>
    6060#else
    6161typedef enum {

  • trunk/Source/WebKit/Shared/mac/ChildProcessMac.mm

    r239427 r239909  
    4242#import <mach/task.h>
    4343#import <pal/crypto/CryptoDigest.h>
     44#import <pal/spi/cocoa/LaunchServicesSPI.h>
    4445#import <pwd.h>
    4546#import <stdlib.h>
    … …  
    5657
    5758#if USE(APPLE_INTERNAL_SDK)
    58 #import <HIServices/ProcessesPriv.h>
     59#import <ApplicationServices/ApplicationServicesPriv.h>
    5960#import <rootless.h>
    6061#endif
    … …  
    6869typedef bool (^LSServerConnectionAllowedBlock) ( CFDictionaryRef optionsRef );
    6970extern "C" void _LSSetApplicationLaunchServicesServerConnectionStatus(uint64_t flags, LSServerConnectionAllowedBlock block);
    70 extern "C" CFDictionaryRef _LSApplicationCheckIn(int sessionID, CFDictionaryRef applicationInfo);
     71extern "C" CFDictionaryRef _LSApplicationCheckIn(LSSessionID sessionID, CFDictionaryRef applicationInfo);
    7172
    7273extern "C" OSStatus SetApplicationIsDaemon(Boolean isDaemon);
    … …  
    159160{
    160161    _LSSetApplicationLaunchServicesServerConnectionStatus(0, 0);
    161     RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(-2, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
     162    RetainPtr<CFDictionaryRef> unused = _LSApplicationCheckIn(kLSDefaultSessionID, CFBundleGetInfoDictionary(CFBundleGetMainBundle()));
    162163}
    163164

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r239904 r239909  
     12019-01-13  Dan Bernstein  <mitz@apple.com>
     2
     3        Tried to fix USE(APPLE_INTERNAL_SDK) builds after r239901.
     4
     5        Patch by Keith Rollin.
     6
     7        * WebView/PDFViewSPI.h:
     8
    192019-01-12  Timothy Hatcher  <timothy@apple.com>
    210

  • trunk/Source/WebKitLegacy/mac/WebView/PDFViewSPI.h

    r232239 r239909  
    2626#if USE(APPLE_INTERNAL_SDK)
    2727
    28 #import <PDFKit/PDFViewPriv.h>
     28#import <Quartz/QuartzPrivate.h>
    2929
    3030#else
Note: See TracChangeset for help on using the changeset viewer.