Changeset 191249 in webkit


Ignore:
Timestamp:
Oct 17, 2015 2:32:28 PM (9 years ago)
Author:
mitz@apple.com
Message:

[Cocoa] Stop using WKAXRegisterRemoteApp
​https://bugs.webkit.org/show_bug.cgi?id=150283

Reviewed by Alexey Proskuryakov.

Source/WebCore:

  • platform/spi/ios/GraphicsServicesSPI.h: Added declaration of GSSystemRootDirectory.

Source/WebKit2:

  • Platform/spi/mac: Added.
  • Platform/spi/mac/AppKitSPI.h: Added. Includes declaration of +[NSAccessibilityRemoteUIElement setRemoteUIApp:].
  • WebKit2.xcodeproj/project.pbxproj: Added reference to new header. Also changed the path of the Platform/spi/Cocoa group to the corresponding path in the source tree.
  • WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::registerWithAccessibility): Added.
(WebKit::WebProcess::platformInitializeProcess): Use new registerWithAccessibility instead

of WKAXRegisterRemoteApp.

Location:
trunk/Source
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r191247 r191249  
     12015-10-17  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Stop using WKAXRegisterRemoteApp
     4        https://bugs.webkit.org/show_bug.cgi?id=150283
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * platform/spi/ios/GraphicsServicesSPI.h: Added declaration of GSSystemRootDirectory.
     9
    1102015-10-17  Chris Dumez  <cdumez@apple.com>
    211

  • trunk/Source/WebCore/platform/spi/ios/GraphicsServicesSPI.h

    r187032 r191249  
    4141void GSInitialize(void);
    4242uint64_t GSCurrentEventTimestamp(void);
     43CFStringRef GSSystemRootDirectory(void);
    4344
    4445WTF_EXTERN_C_END

  • trunk/Source/WebKit2/ChangeLog

    r191243 r191249  
     12015-10-17  Dan Bernstein  <mitz@apple.com>
     2
     3        [Cocoa] Stop using WKAXRegisterRemoteApp
     4        https://bugs.webkit.org/show_bug.cgi?id=150283
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * Platform/spi/mac: Added.
     9        * Platform/spi/mac/AppKitSPI.h: Added. Includes declaration of
     10          +[NSAccessibilityRemoteUIElement setRemoteUIApp:].
     11
     12        * WebKit2.xcodeproj/project.pbxproj: Added reference to new header. Also changed the path of
     13          the Platform/spi/Cocoa group to the corresponding path in the source tree.
     14
     15        * WebProcess/cocoa/WebProcessCocoa.mm:
     16        (WebKit::registerWithAccessibility): Added.
     17        (WebKit::WebProcess::platformInitializeProcess): Use new registerWithAccessibility instead
     18          of WKAXRegisterRemoteApp.
     19
    1202015-10-16  Simon Fraser  <simon.fraser@apple.com>
    221

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r191228 r191249  
    316316                1A81B38118BD66AD0007FDAC /* _WKVisitedLinkStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
    317317                1A81B38518BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B38418BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h */; };
    318                 1A8B66B01BC43C860082DF77 /* PageLoadStateObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8B66AE1BC43C860082DF77 /* PageLoadStateObserver.h */; settings = {ASSET_TAGS = (); }; };
    319                 1A8B66B31BC45B010082DF77 /* WKBundleMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A8B66B11BC45B010082DF77 /* WKBundleMac.mm */; settings = {ASSET_TAGS = (); }; };
     318                1A8B66B01BC43C860082DF77 /* PageLoadStateObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8B66AE1BC43C860082DF77 /* PageLoadStateObserver.h */; };
     319                1A8B66B31BC45B010082DF77 /* WKBundleMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A8B66B11BC45B010082DF77 /* WKBundleMac.mm */; };
    320320                1A8B66B41BC45B010082DF77 /* WKBundleMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8B66B21BC45B010082DF77 /* WKBundleMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
    321321                1A8C728C1738477C000A6554 /* LocalStorageDatabaseTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C728A1738477C000A6554 /* LocalStorageDatabaseTracker.cpp */; };
    … …  
    786786                37716A5A195B910500EE8B1B /* ProcessAssertion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37716A59195B910500EE8B1B /* ProcessAssertion.cpp */; };
    787787                377216B81A4E6BE000DCA718 /* _WKRenderingProgressEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = 377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */; settings = {ATTRIBUTES = (Private, ); }; };
     788                37777A0E1BD2CA11007F74B5 /* AppKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 37777A0D1BD2CA11007F74B5 /* AppKitSPI.h */; };
    788789                377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */; settings = {ATTRIBUTES = (Private, ); }; };
    789790                377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */ = {isa = PBXBuildFile; fileRef = 377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    29372938                3743925718BC4C60001C8675 /* WKUIDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUIDelegatePrivate.h; sourceTree = "<group>"; };
    29382939                374436871820E7240049579F /* WKObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKObject.mm; sourceTree = "<group>"; };
    2939                 3754D5441B3A29FD003A4C7F /* NSInvocationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSInvocationSPI.h; path = Cocoa/NSInvocationSPI.h; sourceTree = "<group>"; };
     2940                3754D5441B3A29FD003A4C7F /* NSInvocationSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSInvocationSPI.h; sourceTree = "<group>"; };
    29402941                375FB4731883415600BE34D4 /* Info-iOS.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-iOS.plist"; sourceTree = "<group>"; };
    29412942                3760881C150413E900FC82C7 /* WebRenderObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebRenderObject.cpp; sourceTree = "<group>"; };
    … …  
    29492950                37716A59195B910500EE8B1B /* ProcessAssertion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessAssertion.cpp; sourceTree = "<group>"; };
    29502951                377216B71A4E6BE000DCA718 /* _WKRenderingProgressEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKRenderingProgressEvents.h; sourceTree = "<group>"; };
     2952                37777A0D1BD2CA11007F74B5 /* AppKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppKitSPI.h; sourceTree = "<group>"; };
    29512953                377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDeclarationSpecifiers.h; sourceTree = "<group>"; };
    29522954                377EAD4617E2C77B002D193D /* WKUserContentInjectedFrames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentInjectedFrames.h; sourceTree = "<group>"; };
    … …  
    52955297                                3754D5441B3A29FD003A4C7F /* NSInvocationSPI.h */,
    52965298                        );
    5297                         name = Cocoa;
     5299                        path = Cocoa;
     5300                        sourceTree = "<group>";
     5301                };
     5302                37777A0C1BD2C9D6007F74B5 /* mac */ = {
     5303                        isa = PBXGroup;
     5304                        children = (
     5305                                37777A0D1BD2CA11007F74B5 /* AppKitSPI.h */,
     5306                        );
     5307                        path = mac;
    52985308                        sourceTree = "<group>";
    52995309                };
    … …  
    73747384                                3754D5411B3A2998003A4C7F /* Cocoa */,
    73757385                                CE1A0BCB1A48E6C60054EF74 /* ios */,
     7386                                37777A0C1BD2C9D6007F74B5 /* mac */,
    73767387                        );
    73777388                        path = spi;
    … …  
    75017512                                E19BDA8A193686A400B97F57 /* SandboxUtilities.h in Headers */,
    75027513                                1A7284471959ED100007BCE5 /* SessionStateConversion.h in Headers */,
     7514                                37777A0E1BD2CA11007F74B5 /* AppKitSPI.h in Headers */,
    75037515                                1AF459321946559500F9D4A2 /* WKError.h in Headers */,
    75047516                                1ADAE12E1919A5B400F48E21 /* WKPreferences.h in Headers */,

  • trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm

    r191014 r191249  
    6262#import <wtf/RAMSize.h>
    6363
     64#if USE(APPKIT)
     65#import "AppKitSPI.h"
     66#endif
     67
     68#if PLATFORM(IOS)
     69#import <WebCore/GraphicsServicesSPI.h>
     70#endif
     71
    6472using namespace WebCore;
    6573
    … …  
    191199}
    192200
     201static void registerWithAccessibility()
     202{
     203#if USE(APPKIT)
     204    [NSAccessibilityRemoteUIElement setRemoteUIApp:YES];
     205#endif
     206#if PLATFORM(IOS)
     207    NSString *accessibilityBundlePath = [(NSString *)GSSystemRootDirectory() stringByAppendingString:@"/System/Library/AccessibilityBundles/WebProcessLoader.axbundle"];
     208    NSError *error;
     209    if (![[NSBundle bundleWithPath:accessibilityBundlePath] loadAndReturnError:&error])
     210        LOG_ERROR("Failed to load accessibility bundle at %@: %@", accessibilityBundlePath, error);
     211#endif
     212}
     213
    193214void WebProcess::platformInitializeProcess(const ChildProcessInitializationParameters&)
    194215{
    195     WKAXRegisterRemoteApp();
     216    registerWithAccessibility();
    196217
    197218#if ENABLE(SEC_ITEM_SHIM)
Note: See TracChangeset for help on using the changeset viewer.