Title: [171872] branches/safari-600.1.4-branch/Source/WebCore
- Revision
- 171872
- Author
- [email protected]
- Date
- 2014-07-31 11:53:12 -0700 (Thu, 31 Jul 2014)
Log Message
Merge r171851. <rdar://problem/17719026>
Modified Paths
Diff
Modified: branches/safari-600.1.4-branch/Source/WebCore/ChangeLog (171871 => 171872)
--- branches/safari-600.1.4-branch/Source/WebCore/ChangeLog 2014-07-31 18:20:51 UTC (rev 171871)
+++ branches/safari-600.1.4-branch/Source/WebCore/ChangeLog 2014-07-31 18:53:12 UTC (rev 171872)
@@ -1,3 +1,20 @@
+2014-07-31 Matthew Hanson <[email protected]>
+
+ Merge r171851. <rdar://problem/17719026>
+
+ 2014-07-31 Jer Noble <[email protected]>
+
+ REGRESSION(??): [iOS] Disabling MediaPlaybackRequiresUserGesture does not remove user gesture requirement for entering full screen.
+ https://bugs.webkit.org/show_bug.cgi?id=135443
+
+ Reviewed by Dean Jackson.
+
+ Allow full screen mode to be entered without a user gesture if the gesture requirement for media playback
+ has been unset.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement):
+
2014-07-30 Matthew Hanson <[email protected]>
Merge r171766. <rdar://problem/17824645>
Modified: branches/safari-600.1.4-branch/Source/WebCore/html/HTMLMediaElement.cpp (171871 => 171872)
--- branches/safari-600.1.4-branch/Source/WebCore/html/HTMLMediaElement.cpp 2014-07-31 18:20:51 UTC (rev 171871)
+++ branches/safari-600.1.4-branch/Source/WebCore/html/HTMLMediaElement.cpp 2014-07-31 18:53:12 UTC (rev 171872)
@@ -359,6 +359,9 @@
#if ENABLE(IOS_AIRPLAY)
m_mediaSession->addBehaviorRestriction(HTMLMediaSession::RequireUserGestureToShowPlaybackTargetPicker);
#endif
+ } else {
+ // Relax RequireUserGestureForFullscreen when mediaPlaybackRequiresUserGesture is not set:
+ m_mediaSession->removeBehaviorRestriction(HTMLMediaSession::RequireUserGestureForFullscreen);
}
#endif // !PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes