Changeset 85366 in webkit


Ignore:
Timestamp:
Apr 29, 2011 4:17:54 PM (13 years ago)
Author:
Chris Fleizach
Message:

2011-04-29 Chris Fleizach <Chris Fleizach>

Reviewed by Beth Dakin.

AX: Remote accessibility should build on snow leopard
https://bugs.webkit.org/show_bug.cgi?id=59767

  • UIProcess/API/mac/WKView.mm: (-[WKView _updateRemoteAccessibilityRegistration:]): (-[WKView viewDidMoveToWindow]): (-[WKView _setAccessibilityWebProcessToken:]):
  • WebProcess/WebPage/mac/WebPageMac.mm: (WebKit::WebPage::platformInitialize): (WebKit::WebPage::registerUIProcessAccessibilityTokens):
  • WebProcess/mac/WebProcessMainMac.mm: (WebKit::WebProcessMain):
Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r85364 r85366  
     12011-04-29  Chris Fleizach  <cfleizach@apple.com>
     2
     3        Reviewed by Beth Dakin.
     4
     5        AX: Remote accessibility should build on snow leopard
     6        https://bugs.webkit.org/show_bug.cgi?id=59767
     7
     8        * UIProcess/API/mac/WKView.mm:
     9        (-[WKView _updateRemoteAccessibilityRegistration:]):
     10        (-[WKView viewDidMoveToWindow]):
     11        (-[WKView _setAccessibilityWebProcessToken:]):
     12        * WebProcess/WebPage/mac/WebPageMac.mm:
     13        (WebKit::WebPage::platformInitialize):
     14        (WebKit::WebPage::registerUIProcessAccessibilityTokens):
     15        * WebProcess/mac/WebProcessMainMac.mm:
     16        (WebKit::WebProcessMain):
     17
    1182011-04-29  Sam Weinig  <sam@webkit.org>
    219
  • trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

    r85356 r85366  
    194194- (void)_updateRemoteAccessibilityRegistration:(BOOL)registerProcess
    195195{
    196 #if !defined(BUILDING_ON_SNOW_LEOPARD)
    197196    // When the tree is connected/disconnected, the remote accessibility registration
    198197    // needs to be updated with the pid of the remote process. If the process is going
     
    207206    if (pid)
    208207        WKAXRegisterRemoteProcess(registerProcess, pid);
    209 #endif
    210208}
    211209
     
    17201718       
    17211719        // Initialize remote accessibility when the window connection has been established.
    1722 #if !defined(BUILDING_ON_SNOW_LEOPARD)
    17231720        NSData *remoteElementToken = WKAXRemoteTokenForElement(self);
    17241721        NSData *remoteWindowToken = WKAXRemoteTokenForElement([self accessibilityAttributeValue:NSAccessibilityWindowAttribute]);
     
    17261723        CoreIPC::DataReference windowToken = CoreIPC::DataReference(reinterpret_cast<const uint8_t*>([remoteWindowToken bytes]), [remoteWindowToken length]);
    17271724        _data->_page->registerUIProcessAccessibilityTokens(elementToken, windowToken);
    1728 #endif   
    17291725           
    17301726    } else {
     
    22202216- (void)_setAccessibilityWebProcessToken:(NSData *)data
    22212217{
    2222 #if !defined(BUILDING_ON_SNOW_LEOPARD)
    22232218    _data->_remoteAccessibilityChild = WKAXRemoteElementForToken(data);
    22242219    [self _updateRemoteAccessibilityRegistration:YES];
    2225 #endif
    22262220}
    22272221
  • trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

    r84526 r85366  
    6464    m_page->addSchedulePair(SchedulePair::create([NSRunLoop currentRunLoop], kCFRunLoopCommonModes));
    6565
    66 #if !defined(BUILDING_ON_SNOW_LEOPARD)
    6766    AccessibilityWebPageObject* mockAccessibilityElement = [[[AccessibilityWebPageObject alloc] init] autorelease];
    6867
     
    7776    send(Messages::WebPageProxy::RegisterWebProcessAccessibilityToken(dataToken));
    7877    m_mockAccessibilityElement = mockAccessibilityElement;
    79 #endif
    8078}
    8179
     
    584582void WebPage::registerUIProcessAccessibilityTokens(const CoreIPC::DataReference& elementToken, const CoreIPC::DataReference& windowToken)
    585583{
    586 #if !defined(BUILDING_ON_SNOW_LEOPARD)
    587584    NSData* elementTokenData = [NSData dataWithBytes:elementToken.data() length:elementToken.size()];
    588585    NSData* windowTokenData = [NSData dataWithBytes:windowToken.data() length:windowToken.size()];
     
    592589   
    593590    [accessibilityRemoteObject() setRemoteParent:remoteElement];
    594 #endif
    595591}
    596592
  • trunk/Source/WebKit2/WebProcess/mac/WebProcessMainMac.mm

    r80014 r85366  
    103103    [[NSApplication sharedApplication] _installAutoreleasePoolsOnCurrentThreadIfNecessary];
    104104
    105 #if !defined(BUILDING_ON_SNOW_LEOPARD)
    106105    WKAXRegisterRemoteApp();
    107 #endif
    108106   
    109107    RunLoop::run();
Note: See TracChangeset for help on using the changeset viewer.