Title: [207936] branches/safari-602-branch/Source
- Revision
- 207936
- Author
- [email protected]
- Date
- 2016-10-26 22:51:29 -0700 (Wed, 26 Oct 2016)
Log Message
Merge r207171. rdar://problem/28857503
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebKit/mac/ChangeLog (207935 => 207936)
--- branches/safari-602-branch/Source/WebKit/mac/ChangeLog 2016-10-27 05:46:15 UTC (rev 207935)
+++ branches/safari-602-branch/Source/WebKit/mac/ChangeLog 2016-10-27 05:51:29 UTC (rev 207936)
@@ -1,3 +1,15 @@
+2016-10-26 Babak Shafiei <[email protected]>
+
+ Merge r207171. rdar://problem/28857503
+
+ 2016-10-11 Daniel Bates <[email protected]>
+
+ 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-20 Matthew Hanson <[email protected]>
Merge r207160. rdar://problem/28857480
Modified: branches/safari-602-branch/Source/WebKit/mac/WebView/WebView.mm (207935 => 207936)
--- branches/safari-602-branch/Source/WebKit/mac/WebView/WebView.mm 2016-10-27 05:46:15 UTC (rev 207935)
+++ branches/safari-602-branch/Source/WebKit/mac/WebView/WebView.mm 2016-10-27 05:51:29 UTC (rev 207936)
@@ -901,8 +901,12 @@
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)
Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (207935 => 207936)
--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-27 05:46:15 UTC (rev 207935)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-27 05:51:29 UTC (rev 207936)
@@ -1,3 +1,15 @@
+2016-10-26 Babak Shafiei <[email protected]>
+
+ Merge r207171. rdar://problem/28857503
+
+ 2016-10-11 Daniel Bates <[email protected]>
+
+ 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-24 Matthew Hanson <[email protected]>
Merge r206762. rdar://problem/28544885
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (207935 => 207936)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-10-27 05:46:15 UTC (rev 207935)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-10-27 05:51:29 UTC (rev 207936)
@@ -327,8 +327,12 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
