Changeset 191637 in webkit
- Timestamp:
- Oct 27, 2015 1:55:36 PM (8 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r191634 r191637 1 2015-10-27 Tim Horton <timothy_horton@apple.com> 2 3 WKView being inside WKWebView leads to weird API issues 4 https://bugs.webkit.org/show_bug.cgi?id=150174 5 6 Reviewed by Anders Carlsson. 7 8 * UIProcess/API/mac/WKView.mm: 9 (-[WKView _superAccessibilityAttributeValue:]): 10 (-[WKView accessibilityFocusedUIElement]): 11 (-[WKView accessibilityIsIgnored]): 12 (-[WKView accessibilityHitTest:]): 13 (-[WKView accessibilityAttributeValue:]): 14 (-[WKView _processDidExit]): 15 (-[WKView _pageClosed]): 16 (-[WKView _updateRemoteAccessibilityRegistration:]): Deleted. 17 (-[WKView enableAccessibilityIfNecessary]): Deleted. 18 (-[WKView _toolTipChangedFrom:to:]): Deleted. 19 (-[WKView _setAccessibilityWebProcessToken:]): Deleted. 20 (-[WKView _hasFullScreenWindowController]): Deleted. 21 (-[WKView _fullScreenWindowController]): Deleted. 22 (-[WKView _closeFullScreenWindowController]): Deleted. 23 (-[WKView _setSuppressVisibilityUpdates:]): Deleted. 24 (-[WKView _suppressVisibilityUpdates]): Deleted. 25 (-[WKView _primaryTrackingArea]): Deleted. 26 (-[WKView _setPrimaryTrackingArea:]): Deleted. 27 (-[WKView initWithFrame:processPool:configuration:webView:]): Deleted. 28 * UIProcess/API/mac/WKViewInternal.h: 29 * UIProcess/Cocoa/WebViewImpl.h: 30 (WebKit::WebViewImpl::accessibilityIsIgnored): 31 (WebKit::WebViewImpl::primaryTrackingArea): 32 * UIProcess/Cocoa/WebViewImpl.mm: 33 (WebKit::trackingAreaOptions): 34 (WebKit::WebViewImpl::WebViewImpl): 35 (WebKit::WebViewImpl::setAccessibilityWebProcessToken): 36 (WebKit::WebViewImpl::updateRemoteAccessibilityRegistration): 37 (WebKit::WebViewImpl::accessibilityFocusedUIElement): 38 (WebKit::WebViewImpl::accessibilityHitTest): 39 (WebKit::WebViewImpl::enableAccessibilityIfNecessary): 40 (WebKit::WebViewImpl::accessibilityAttributeValue): 41 (WebKit::WebViewImpl::setPrimaryTrackingArea): 42 (WebKit::WebViewImpl::toolTipChanged): 43 * UIProcess/mac/PageClientImpl.mm: 44 (WebKit::PageClientImpl::toolTipChanged): 45 (WebKit::PageClientImpl::accessibilityWebProcessTokenReceived): 46 (WebKit::PageClientImpl::recommendedScrollbarStyleDidChange): 47 (WebKit::PageClientImpl::closeFullScreenManager): 48 (WebKit::PageClientImpl::isFullScreen): 49 (WebKit::PageClientImpl::enterFullScreen): 50 (WebKit::PageClientImpl::exitFullScreen): 51 (WebKit::PageClientImpl::beganEnterFullScreen): 52 (WebKit::PageClientImpl::beganExitFullScreen): 53 Move accessibility code, and fold in some internal-only methods. 54 1 55 2015-10-27 Tim Horton <timothy_horton@apple.com> 2 56 -
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
r191634 r191637 162 162 RetainPtr<_WKRemoteObjectRegistry> _remoteObjectRegistry; 163 163 #endif 164 165 RetainPtr<NSTrackingArea> _primaryTrackingArea;166 167 RetainPtr<id> _remoteAccessibilityChild;168 164 169 165 // For asynchronous validation. … … 2048 2044 } 2049 2045 2046 - (id)_superAccessibilityAttributeValue:(NSString *)attribute 2047 { 2048 #pragma clang diagnostic push 2049 #pragma clang diagnostic ignored "-Wdeprecated-declarations" 2050 return [super accessibilityAttributeValue:attribute]; 2051 #pragma clang diagnostic pop 2052 } 2053 2050 2054 - (NSArray *)validAttributesForMarkedText 2051 2055 { … … 2170 2174 } 2171 2175 2172 - (void)_updateRemoteAccessibilityRegistration:(BOOL)registerProcess2173 {2174 // When the tree is connected/disconnected, the remote accessibility registration2175 // needs to be updated with the pid of the remote process. If the process is going2176 // away, that information is not present in WebProcess2177 pid_t pid = 0;2178 if (registerProcess)2179 pid = _data->_page->process().processIdentifier();2180 else if (!registerProcess) {2181 pid = WKAXRemoteProcessIdentifier(_data->_remoteAccessibilityChild.get());2182 _data->_remoteAccessibilityChild = nil;2183 }2184 if (pid)2185 WKAXRegisterRemoteProcess(registerProcess, pid);2186 }2187 2188 - (void)enableAccessibilityIfNecessary2189 {2190 if (WebCore::AXObjectCache::accessibilityEnabled())2191 return;2192 2193 // After enabling accessibility update the window frame on the web process so that the2194 // correct accessibility position is transmitted (when AX is off, that position is not calculated).2195 WebCore::AXObjectCache::enableAccessibility();2196 _data->_impl->updateWindowAndViewFrames();2197 }2198 2199 2176 - (id)accessibilityFocusedUIElement 2200 2177 { 2201 [self enableAccessibilityIfNecessary]; 2202 return _data->_remoteAccessibilityChild.get(); 2178 return _data->_impl->accessibilityFocusedUIElement(); 2203 2179 } 2204 2180 2205 2181 - (BOOL)accessibilityIsIgnored 2206 2182 { 2207 return NO;2183 return _data->_impl->accessibilityIsIgnored(); 2208 2184 } 2209 2185 2210 2186 - (id)accessibilityHitTest:(NSPoint)point 2211 2187 { 2212 [self enableAccessibilityIfNecessary]; 2213 return _data->_remoteAccessibilityChild.get(); 2214 } 2215 2216 - (id)accessibilityAttributeValue:(NSString*)attribute 2217 { 2218 [self enableAccessibilityIfNecessary]; 2219 2220 if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) { 2221 2222 id child = nil; 2223 if (_data->_remoteAccessibilityChild) 2224 child = _data->_remoteAccessibilityChild.get(); 2225 2226 if (!child) 2227 return nil; 2228 return [NSArray arrayWithObject:child]; 2229 } 2230 if ([attribute isEqualToString:NSAccessibilityRoleAttribute]) 2231 return NSAccessibilityGroupRole; 2232 if ([attribute isEqualToString:NSAccessibilityRoleDescriptionAttribute]) 2233 return NSAccessibilityRoleDescription(NSAccessibilityGroupRole, nil); 2234 if ([attribute isEqualToString:NSAccessibilityParentAttribute]) 2235 return NSAccessibilityUnignoredAncestor([self superview]); 2236 if ([attribute isEqualToString:NSAccessibilityEnabledAttribute]) 2237 return [NSNumber numberWithBool:YES]; 2238 2239 return [super accessibilityAttributeValue:attribute]; 2188 return _data->_impl->accessibilityHitTest(NSPointToCGPoint(point)); 2189 } 2190 2191 - (id)accessibilityAttributeValue:(NSString *)attribute 2192 { 2193 return _data->_impl->accessibilityAttributeValue(attribute); 2240 2194 } 2241 2195 … … 2279 2233 _data->_impl->setAcceleratedCompositingRootLayer(nil); 2280 2234 2281 [self _updateRemoteAccessibilityRegistration:NO];2235 _data->_impl->updateRemoteAccessibilityRegistration(false); 2282 2236 2283 2237 _data->_impl->resetGestureController(); … … 2286 2240 - (void)_pageClosed 2287 2241 { 2288 [self _updateRemoteAccessibilityRegistration:NO];2242 _data->_impl->updateRemoteAccessibilityRegistration(false); 2289 2243 } 2290 2244 … … 2377 2331 { 2378 2332 return _data->_impl->stringForToolTip(tag); 2379 }2380 2381 - (void)_toolTipChangedFrom:(NSString *)oldToolTip to:(NSString *)newToolTip2382 {2383 _data->_impl->toolTipChanged(oldToolTip, newToolTip);2384 }2385 2386 - (void)_setAccessibilityWebProcessToken:(NSData *)data2387 {2388 _data->_remoteAccessibilityChild = WKAXRemoteElementForToken(data);2389 [self _updateRemoteAccessibilityRegistration:YES];2390 2333 } 2391 2334 … … 2547 2490 } 2548 2491 2549 #if ENABLE(FULLSCREEN_API)2550 - (BOOL)_hasFullScreenWindowController2551 {2552 return _data->_impl->hasFullScreenWindowController();2553 }2554 2555 - (WKFullScreenWindowController *)_fullScreenWindowController2556 {2557 return _data->_impl->fullScreenWindowController();2558 }2559 2560 - (void)_closeFullScreenWindowController2561 {2562 _data->_impl->closeFullScreenWindowController();2563 }2564 #endif2565 2566 2492 - (bool)_executeSavedCommandBySelector:(SEL)selector 2567 2493 { … … 2589 2515 } 2590 2516 2591 - (void)_setSuppressVisibilityUpdates:(BOOL)suppressVisibilityUpdates2592 {2593 _data->_page->setSuppressVisibilityUpdates(suppressVisibilityUpdates);2594 }2595 2596 - (BOOL)_suppressVisibilityUpdates2597 {2598 return _data->_page->suppressVisibilityUpdates();2599 }2600 2601 - (NSTrackingArea *)_primaryTrackingArea2602 {2603 return _data->_primaryTrackingArea.get();2604 }2605 2606 - (void)_setPrimaryTrackingArea:(NSTrackingArea *)trackingArea2607 {2608 [self removeTrackingArea:_data->_primaryTrackingArea.get()];2609 _data->_primaryTrackingArea = trackingArea;2610 [self addTrackingArea:trackingArea];2611 }2612 2613 2517 - (instancetype)initWithFrame:(NSRect)frame processPool:(WebProcessPool&)processPool configuration:(Ref<API::PageConfiguration>&&)configuration webView:(WKWebView *)webView 2614 2518 { … … 2621 2525 InitializeWebKit2(); 2622 2526 2623 // Legacy style scrollbars have design details that rely on tracking the mouse all the time.2624 NSTrackingAreaOptions options = NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect | NSTrackingCursorUpdate;2625 if (WKRecommendedScrollerStyle() == NSScrollerStyleLegacy)2626 options |= NSTrackingActiveAlways;2627 else2628 options |= NSTrackingActiveInKeyWindow;2629 2630 2527 _data = [[WKViewData alloc] init]; 2631 _data->_primaryTrackingArea = adoptNS([[NSTrackingArea alloc] initWithRect:frame options:options owner:self userInfo:nil]);2632 [self addTrackingArea:_data->_primaryTrackingArea.get()];2633 2528 2634 2529 _data->_pageClient = std::make_unique<PageClientImpl>(self, webView); -
trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h
r191634 r191637 28 28 #import "WKViewPrivate.h" 29 29 30 #import "APIObject.h"31 #import "PluginComplexTextInputState.h"32 #import "SameDocumentNavigationType.h"33 #import "WebFindOptions.h"34 #import "WebHitTestResultData.h"35 30 #import <wtf/Forward.h> 36 31 #import <wtf/RetainPtr.h> … … 40 35 41 36 namespace API { 42 class Object;43 37 class PageConfiguration; 44 38 } … … 51 45 class Image; 52 46 class SharedBuffer; 53 class TextIndicator;54 enum class TextIndicatorWindowLifetime : uint8_t;55 enum class TextIndicatorWindowDismissalAnimation : uint8_t;56 struct KeypressCommand;57 47 } 58 48 59 49 namespace WebKit { 60 50 class DrawingAreaProxy; 61 class LayerTreeContext;62 class ViewSnapshot;63 51 class WebProcessPool; 64 52 struct ColorSpaceData; 65 struct EditorState;66 53 } 67 54 68 @class WKFullScreenWindowController;69 55 @class WKWebView; 70 56 #if WK_API_ENABLED … … 81 67 - (void)_pageClosed; 82 68 - (void)_didRelaunchProcess; 83 - (void)_toolTipChangedFrom:(NSString *)oldToolTip to:(NSString *)newToolTip;84 69 - (void)_setUserInterfaceItemState:(NSString *)commandName enabled:(BOOL)isEnabled state:(int)newState; 85 70 - (void)_doneWithKeyEvent:(NSEvent *)event eventWasHandled:(BOOL)eventWasHandled; … … 87 72 - (NSRect)_convertToDeviceSpace:(NSRect)rect; 88 73 - (NSRect)_convertToUserSpace:(NSRect)rect; 89 90 - (void)_setAccessibilityWebProcessToken:(NSData *)data;91 74 92 75 - (void)_dragImageForView:(NSView *)view withImage:(NSImage *)image at:(NSPoint)clientPoint linkDrag:(BOOL)linkDrag; … … 101 84 - (void)handleAcceptedAlternativeText:(NSString*)text; 102 85 103 - (void)_setSuppressVisibilityUpdates:(BOOL)suppressVisibilityUpdates;104 - (BOOL)_suppressVisibilityUpdates;105 106 86 #if WK_API_ENABLED 107 87 @property (nonatomic, setter=_setThumbnailView:) _WKThumbnailView *_thumbnailView; … … 109 89 110 90 - (void)_addFontPanelObserver; 111 // FullScreen112 113 @property (readonly) BOOL _hasFullScreenWindowController;114 @property (readonly) WKFullScreenWindowController *_fullScreenWindowController;115 - (void)_closeFullScreenWindowController;116 91 117 92 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100 118 93 - (void)_startWindowDrag; 119 94 #endif 120 121 @property (nonatomic, retain, setter=_setPrimaryTrackingArea:) NSTrackingArea *_primaryTrackingArea;122 95 123 96 #if WK_API_ENABLED -
trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h
r191634 r191637 56 56 - (void)_superMagnifyWithEvent:(NSEvent *)event; 57 57 - (void)_superSmartMagnifyWithEvent:(NSEvent *)event; 58 - (id)_superAccessibilityAttributeValue:(NSString *)attribute; 58 59 59 60 // This is a hack; these things live can live on a category (e.g. WKView (Private)) but WKView itself conforms to this protocol. … … 226 227 bool ignoresMouseDraggedEvents() const { return m_ignoresMouseDraggedEvents; } 227 228 229 void setAccessibilityWebProcessToken(NSData *); 228 230 void accessibilityRegisterUIProcessTokens(); 231 void updateRemoteAccessibilityRegistration(bool registerProcess); 232 id accessibilityFocusedUIElement(); 233 bool accessibilityIsIgnored() const { return false; } 234 id accessibilityHitTest(CGPoint); 235 void enableAccessibilityIfNecessary(); 236 id accessibilityAttributeValue(NSString *); 237 238 NSTrackingArea *primaryTrackingArea() const { return m_primaryTrackingArea.get(); } 239 void setPrimaryTrackingArea(NSTrackingArea *); 229 240 230 241 NSTrackingRectTag addTrackingRect(CGRect, id owner, void* userData, bool assumeInside); … … 234 245 void removeTrackingRects(NSTrackingRectTag *, int count); 235 246 NSString *stringForToolTip(NSToolTipTag tag); 236 void toolTipChanged( NSString *oldToolTip, NSString *newToolTip);247 void toolTipChanged(const String& oldToolTip, const String& newToolTip); 237 248 238 249 void setAcceleratedCompositingRootLayer(CALayer *); … … 369 380 bool m_didRegisterForLookupPopoverCloseNotifications { false }; 370 381 382 RetainPtr<NSTrackingArea> m_primaryTrackingArea; 383 371 384 NSToolTipTag m_lastToolTipTag { 0 }; 372 385 id m_trackingRectOwner { nil }; … … 383 396 bool m_allowsBackForwardNavigationGestures { false }; 384 397 bool m_allowsMagnification { false }; 398 399 RetainPtr<id> m_remoteAccessibilityChild; 385 400 }; 386 401 -
trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm
r191634 r191637 322 322 namespace WebKit { 323 323 324 static NSTrackingAreaOptions trackingAreaOptions() 325 { 326 // Legacy style scrollbars have design details that rely on tracking the mouse all the time. 327 NSTrackingAreaOptions options = NSTrackingMouseMoved | NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect | NSTrackingCursorUpdate; 328 if (WKRecommendedScrollerStyle() == NSScrollerStyleLegacy) 329 options |= NSTrackingActiveAlways; 330 else 331 options |= NSTrackingActiveInKeyWindow; 332 return options; 333 } 334 324 335 WebViewImpl::WebViewImpl(NSView <WebViewImplDelegate> *view, WebPageProxy& page, PageClient& pageClient) 325 336 : m_view(view) … … 332 343 , m_undoTarget(adoptNS([[WKEditorUndoTargetObjC alloc] init])) 333 344 , m_windowVisibilityObserver(adoptNS([[WKWindowVisibilityObserver alloc] initWithView:view impl:*this])) 334 { 345 , m_primaryTrackingArea(adoptNS([[NSTrackingArea alloc] initWithRect:m_view.frame options:trackingAreaOptions() owner:m_view userInfo:nil])) 346 { 347 [m_view addTrackingArea:m_primaryTrackingArea.get()]; 348 335 349 m_page.setIntrinsicDeviceScaleFactor(intrinsicDeviceScaleFactor()); 336 350 … … 1465 1479 } 1466 1480 1481 void WebViewImpl::setAccessibilityWebProcessToken(NSData *data) 1482 { 1483 m_remoteAccessibilityChild = WKAXRemoteElementForToken(data); 1484 updateRemoteAccessibilityRegistration(true); 1485 } 1486 1487 void WebViewImpl::updateRemoteAccessibilityRegistration(bool registerProcess) 1488 { 1489 // When the tree is connected/disconnected, the remote accessibility registration 1490 // needs to be updated with the pid of the remote process. If the process is going 1491 // away, that information is not present in WebProcess 1492 pid_t pid = 0; 1493 if (registerProcess) 1494 pid = m_page.process().processIdentifier(); 1495 else if (!registerProcess) { 1496 pid = WKAXRemoteProcessIdentifier(m_remoteAccessibilityChild.get()); 1497 m_remoteAccessibilityChild = nil; 1498 } 1499 if (pid) 1500 WKAXRegisterRemoteProcess(registerProcess, pid); 1501 } 1502 1467 1503 void WebViewImpl::accessibilityRegisterUIProcessTokens() 1468 1504 { … … 1473 1509 IPC::DataReference windowToken = IPC::DataReference(reinterpret_cast<const uint8_t*>([remoteWindowToken bytes]), [remoteWindowToken length]); 1474 1510 m_page.registerUIProcessAccessibilityTokens(elementToken, windowToken); 1511 } 1512 1513 id WebViewImpl::accessibilityFocusedUIElement() 1514 { 1515 enableAccessibilityIfNecessary(); 1516 return m_remoteAccessibilityChild.get(); 1517 } 1518 1519 id WebViewImpl::accessibilityHitTest(CGPoint) 1520 { 1521 return accessibilityFocusedUIElement(); 1522 } 1523 1524 void WebViewImpl::enableAccessibilityIfNecessary() 1525 { 1526 if (WebCore::AXObjectCache::accessibilityEnabled()) 1527 return; 1528 1529 // After enabling accessibility update the window frame on the web process so that the 1530 // correct accessibility position is transmitted (when AX is off, that position is not calculated). 1531 WebCore::AXObjectCache::enableAccessibility(); 1532 updateWindowAndViewFrames(); 1533 } 1534 1535 id WebViewImpl::accessibilityAttributeValue(NSString *attribute) 1536 { 1537 enableAccessibilityIfNecessary(); 1538 1539 if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) { 1540 1541 id child = nil; 1542 if (m_remoteAccessibilityChild) 1543 child = m_remoteAccessibilityChild.get(); 1544 1545 if (!child) 1546 return nil; 1547 return [NSArray arrayWithObject:child]; 1548 } 1549 if ([attribute isEqualToString:NSAccessibilityRoleAttribute]) 1550 return NSAccessibilityGroupRole; 1551 if ([attribute isEqualToString:NSAccessibilityRoleDescriptionAttribute]) 1552 return NSAccessibilityRoleDescription(NSAccessibilityGroupRole, nil); 1553 if ([attribute isEqualToString:NSAccessibilityParentAttribute]) 1554 return NSAccessibilityUnignoredAncestor([m_view superview]); 1555 if ([attribute isEqualToString:NSAccessibilityEnabledAttribute]) 1556 return @YES; 1557 1558 return [m_view _superAccessibilityAttributeValue:attribute]; 1559 } 1560 1561 void WebViewImpl::setPrimaryTrackingArea(NSTrackingArea *trackingArea) 1562 { 1563 [m_view removeTrackingArea:m_primaryTrackingArea.get()]; 1564 m_primaryTrackingArea = trackingArea; 1565 [m_view addTrackingArea:trackingArea]; 1475 1566 } 1476 1567 … … 1572 1663 } 1573 1664 1574 void WebViewImpl::toolTipChanged( NSString *oldToolTip, NSString *newToolTip)1575 { 1576 if ( oldToolTip)1665 void WebViewImpl::toolTipChanged(const String& oldToolTip, const String& newToolTip) 1666 { 1667 if (!oldToolTip.isNull()) 1577 1668 sendToolTipMouseExited(); 1578 1669 1579 if ( newToolTip && [newToolTip length] > 0) {1670 if (!newToolTip.isEmpty()) { 1580 1671 // See radar 3500217 for why we remove all tooltips rather than just the single one we created. 1581 1672 [m_view removeAllToolTips]; -
trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm
r191634 r191637 265 265 void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newToolTip) 266 266 { 267 [m_wkView _toolTipChangedFrom:nsStringFromWebCoreString(oldToolTip) to:nsStringFromWebCoreString(newToolTip)];267 m_impl->toolTipChanged(oldToolTip, newToolTip); 268 268 } 269 269 … … 475 475 void PageClientImpl::accessibilityWebProcessTokenReceived(const IPC::DataReference& data) 476 476 { 477 NSData* remoteToken = [NSData dataWithBytes:data.data() length:data.size()]; 478 [m_wkView _setAccessibilityWebProcessToken:remoteToken]; 477 m_impl->setAccessibilityWebProcessToken([NSData dataWithBytes:data.data() length:data.size()]); 479 478 } 480 479 … … 602 601 603 602 RetainPtr<NSTrackingArea> trackingArea = adoptNS([[NSTrackingArea alloc] initWithRect:[m_wkView frame] options:options owner:m_wkView userInfo:nil]); 604 [m_wkView _setPrimaryTrackingArea:trackingArea.get()];603 m_impl->setPrimaryTrackingArea(trackingArea.get()); 605 604 } 606 605 … … 659 658 void PageClientImpl::closeFullScreenManager() 660 659 { 661 [m_wkView _closeFullScreenWindowController];660 m_impl->closeFullScreenWindowController(); 662 661 } 663 662 664 663 bool PageClientImpl::isFullScreen() 665 664 { 666 if (!m_ wkView._hasFullScreenWindowController)665 if (!m_impl->hasFullScreenWindowController()) 667 666 return false; 668 667 669 return m_ wkView._fullScreenWindowController.isFullScreen;668 return m_impl->fullScreenWindowController().isFullScreen; 670 669 } 671 670 672 671 void PageClientImpl::enterFullScreen() 673 672 { 674 [m_ wkView._fullScreenWindowControllerenterFullScreen:nil];673 [m_impl->fullScreenWindowController() enterFullScreen:nil]; 675 674 } 676 675 677 676 void PageClientImpl::exitFullScreen() 678 677 { 679 [m_ wkView._fullScreenWindowControllerexitFullScreen];678 [m_impl->fullScreenWindowController() exitFullScreen]; 680 679 } 681 680 682 681 void PageClientImpl::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) 683 682 { 684 [m_ wkView._fullScreenWindowControllerbeganEnterFullScreenWithInitialFrame:initialFrame finalFrame:finalFrame];683 [m_impl->fullScreenWindowController() beganEnterFullScreenWithInitialFrame:initialFrame finalFrame:finalFrame]; 685 684 m_impl->updateSupportsArbitraryLayoutModes(); 686 685 } … … 688 687 void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) 689 688 { 690 [m_ wkView._fullScreenWindowControllerbeganExitFullScreenWithInitialFrame:initialFrame finalFrame:finalFrame];689 [m_impl->fullScreenWindowController() beganExitFullScreenWithInitialFrame:initialFrame finalFrame:finalFrame]; 691 690 m_impl->updateSupportsArbitraryLayoutModes(); 692 691 }
Note: See TracChangeset
for help on using the changeset viewer.