[webkit-changes] [176283] trunk/Source/WebKit2

Tue, 18 Nov 2014 14:10:30 -0800

Title: [176283] trunk/Source/WebKit2
Revision
176283
Author
[email protected]
Date
2014-11-18 14:10:09 -0800 (Tue, 18 Nov 2014)

Log 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.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (176282 => 176283)


--- trunk/Source/WebKit2/ChangeLog	2014-11-18 22:05:10 UTC (rev 176282)
+++ trunk/Source/WebKit2/ChangeLog	2014-11-18 22:10:09 UTC (rev 176283)
@@ -1,3 +1,22 @@
+2014-11-18  Eric Carlson  <[email protected]>
+
+        [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.
+
 2014-11-18  Myles C. Maxfield  <[email protected]>
 
         Subclass CachedFont for SVG fonts

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (176282 => 176283)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2014-11-18 22:05:10 UTC (rev 176282)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2014-11-18 22:10:09 UTC (rev 176283)
@@ -289,7 +289,7 @@
 
 #if PLATFORM(IOS)
     webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsInlineKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsInlineMediaPlayback]));
-    webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsAlternateFullscreen]));
+    webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::allowsAlternateFullscreenKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsAlternateFullscreen]));
     webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackRequiresUserGestureKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackRequiresUserAction]));
     webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::mediaPlaybackAllowsAirPlayKey(), WebKit::WebPreferencesStore::Value(!![_configuration mediaPlaybackAllowsAirPlay]));
 #endif

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (176282 => 176283)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h	2014-11-18 22:05:10 UTC (rev 176282)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h	2014-11-18 22:10:09 UTC (rev 176283)
@@ -102,11 +102,6 @@
  */
 @property (nonatomic) WKSelectionGranularity selectionGranularity;
 
-/*! @abstract A Boolean value indicating whether alternate fullscreen mode is allowed.
- @discussion The default value is YES.
- */
-@property (nonatomic) BOOL allowsAlternateFullscreen;
-
 #endif
 
 @end

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (176282 => 176283)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	2014-11-18 22:05:10 UTC (rev 176282)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	2014-11-18 22:10:09 UTC (rev 176283)
@@ -77,6 +77,7 @@
     RetainPtr<NSString> _groupIdentifier;
 #if PLATFORM(IOS)
     LazyInitialized<WKWebViewContentProviderRegistry> _contentProviderRegistry;
+    BOOL _allowsAlternateFullscreen;
 #endif
 }
 
@@ -245,6 +246,16 @@
     _groupIdentifier = groupIdentifier;
 }
 
+- (BOOL) _allowsAlternateFullscreen
+{
+    return _allowsAlternateFullscreen;
+}
+
+- (void)_setAllowsAlternateFullscreen:(BOOL)allowed
+{
+    _allowsAlternateFullscreen = allowed;
+}
+
 @end
 
 #endif // WK_API_ENABLED

Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (176282 => 176283)


--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h	2014-11-18 22:05:10 UTC (rev 176282)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h	2014-11-18 22:10:09 UTC (rev 176283)
@@ -42,6 +42,10 @@
 
 @property (nonatomic, weak, setter=_setAlternateWebViewForNavigationGestures:) WKWebView *_alternateWebViewForNavigationGestures;
 
+#if PLATFORM(IOS)
+@property (nonatomic, setter=_setAllowsAlternateFullscreen:) BOOL _allowsAlternateFullscreen;
+#endif
+
 @end
 
 #endif

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to