Attempt to fix the Apple Internal Mac build following r207159
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Oct 2016 22:19:02 +0000 (22:19 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Oct 2016 22:19:02 +0000 (22:19 +0000)
(https://bugs.webkit.org/show_bug.cgi?id=163244)

Source/WebKit/mac:

* WebView/WebView.mm:
(shouldRequireUserGestureToLoadVideo):

Source/WebKit2:

* UIProcess/API/Cocoa/WKWebView.mm:
(shouldRequireUserGestureToLoadVideo):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@207171 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

index dc7ea36..1d7aa54 100644 (file)
@@ -1,5 +1,13 @@
 2016-10-11  Daniel Bates  <dabates@apple.com>
 
+        Attempt to fix the Apple Internal Mac build following r207159
+        (https://bugs.webkit.org/show_bug.cgi?id=163244)
+
+        * WebView/WebView.mm:
+        (shouldRequireUserGestureToLoadVideo):
+
+2016-10-11  Daniel Bates  <dabates@apple.com>
+
         REGRESSION (r198251): -[UIWebView mediaPlaybackRequiresUserAction] defaults to NO
         https://bugs.webkit.org/show_bug.cgi?id=163259
         <rdar://problem/28680515>
index d6a576c..c23e62c 100644 (file)
@@ -905,8 +905,12 @@ static bool shouldConvertInvalidURLsToBlank()
 
 static bool shouldRequireUserGestureToLoadVideo()
 {
+#if PLATFORM(IOS)
     static bool shouldRequireUserGestureToLoadVideo = dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_10_0;
     return shouldRequireUserGestureToLoadVideo;
+#else
+    return true;
+#endif
 }
 
 #if ENABLE(GAMEPAD)
index f5de57a..36781c7 100644 (file)
@@ -1,3 +1,11 @@
+2016-10-11  Daniel Bates  <dabates@apple.com>
+
+        Attempt to fix the Apple Internal Mac build following r207159
+        (https://bugs.webkit.org/show_bug.cgi?id=163244)
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (shouldRequireUserGestureToLoadVideo):
+
 2016-10-11  Anders Carlsson  <andersca@apple.com>
 
         Clean up WebPageGroup somewhat
index b436242..df98f7e 100644 (file)
@@ -328,8 +328,12 @@ static bool shouldAllowPictureInPictureMediaPlayback()
 
 static bool shouldRequireUserGestureToLoadVideo()
 {
+#if PLATFORM(IOS)
     static bool shouldRequireUserGestureToLoadVideo = dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_10_0;
     return shouldRequireUserGestureToLoadVideo;
+#else
+    return true;
+#endif
 }
 
 #if ENABLE(DATA_DETECTION) && PLATFORM(IOS)