Changeset 176283 in webkit


Ignore:
Timestamp:
Nov 18, 2014, 2:10:09 PM (10 years ago)
Author:
eric.carlson@apple.com
Message:

[iOS] allow host application to opt-out of alternate fullscreen
​https://bugs.webkit.org/show_bug.cgi?id=138787

Reviewed by Sam Weinig.

"allowsAlternateFullscreen" doesn't need to be in the public WKWebView header.

  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView initWithFrame:configuration:]): allowsAlternateFullscreen -> _allowsAlternateFullscreen.

  • UIProcess/API/Cocoa/WKWebViewConfiguration.h: Remove allowsAlternateFullscreen.
  • UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration _allowsAlternateFullscreen]): New.
(-[WKWebViewConfiguration _setAllowsAlternateFullscreen:]): New.

  • UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: Declare _allowsAlternateFullscreen.
Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r176276 r176283  
     12014-11-18  Eric Carlson  <eric.carlson@apple.com>
     2
     3        [iOS] allow host application to opt-out of alternate fullscreen
     4        https://bugs.webkit.org/show_bug.cgi?id=138787
     5
     6        Reviewed by Sam Weinig.
     7       
     8        "allowsAlternateFullscreen" doesn't need to be in the public WKWebView header.
     9
     10        * UIProcess/API/Cocoa/WKWebView.mm:
     11        (-[WKWebView initWithFrame:configuration:]): allowsAlternateFullscreen -> _allowsAlternateFullscreen.
     12
     13        * UIProcess/API/Cocoa/WKWebViewConfiguration.h: Remove allowsAlternateFullscreen.
     14        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
     15        (-[WKWebViewConfiguration _allowsAlternateFullscreen]): New.
     16        (-[WKWebViewConfiguration _setAllowsAlternateFullscreen:]): New.
     17
     18        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: Declare _allowsAlternateFullscreen.
     19
    1202014-11-18  Myles C. Maxfield  <mmaxfield@apple.com>
    221

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r176204 r176283  
    290290#if PLATFORM(IOS)
    291291    webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsInlineKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
    292     webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsAlternateFullscreen]));
     292    webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsAlternateFullscreen]));
    293293    webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackRequiresUserGestureKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackRequiresUserAction]));
    294294    webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsAirPlayKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h

    r176199 r176283  
    103103@property (nonatomic) WKSelectionGranularity selectionGranularity;
    104104
    105 /*! @abstract A Boolean value indicating whether alternate fullscreen mode is allowed.
    106  @discussion The default value is YES.
    107  */
    108 @property (nonatomic) BOOL allowsAlternateFullscreen;
    109 
    110105#endif
    111106

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

    r176199 r176283  
    7878#if PLATFORM(IOS)
    7979    LazyInitialized<WKWebViewContentProviderRegistry> _contentProviderRegistry;
     80    BOOL _allowsAlternateFullscreen;
    8081#endif
    8182}
    … …  
    246247}
    247248
     249- (BOOL) _allowsAlternateFullscreen
     250{
     251    return _allowsAlternateFullscreen;
     252}
     253
     254- (void)_setAllowsAlternateFullscreen:(BOOL)allowed
     255{
     256    _allowsAlternateFullscreen = allowed;
     257}
     258
    248259@end
    249260

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h

    r171219 r176283  
    4343@property (nonatomic, weak, setter=_setAlternateWebViewForNavigationGestures:) WKWebView *_alternateWebViewForNavigationGestures;
    4444
     45#if PLATFORM(IOS)
     46@property (nonatomic, setter=_setAllowsAlternateFullscreen:) BOOL _allowsAlternateFullscreen;
     47#endif
     48
    4549@end
    4650
Note: See TracChangeset for help on using the changeset viewer.