Title: [175730] tags/Safari-601.1.8/Source/WebCore
- Revision
- 175730
- Author
- bshaf...@apple.com
- Date
- 2014-11-06 16:53:38 -0800 (Thu, 06 Nov 2014)
Log Message
Merged r175727. rdar://problem/18896362
Modified Paths
Diff
Modified: tags/Safari-601.1.8/Source/WebCore/ChangeLog (175729 => 175730)
--- tags/Safari-601.1.8/Source/WebCore/ChangeLog 2014-11-07 00:49:36 UTC (rev 175729)
+++ tags/Safari-601.1.8/Source/WebCore/ChangeLog 2014-11-07 00:53:38 UTC (rev 175730)
@@ -1,5 +1,20 @@
2014-11-06 Babak Shafiei <bshaf...@apple.com>
+ Merge r175727.
+
+ 2014-11-06 Jeremy Jones <jere...@apple.com>
+
+ Fix typo in optimized fullscreen activation.
+ https://bugs.webkit.org/show_bug.cgi?id=138480
+
+ Reviewed by Jer Noble.
+
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.handleWrapperTouchStart): fix typo doubleTouchIntervalThresholdms
+ (ControllerIOS.prototype.handleOptimizedFullscreenButtonClicked): fix typo isFullScreen
+
+2014-11-06 Babak Shafiei <bshaf...@apple.com>
+
Merge r175706.
2014-11-06 Michael Saboff <msab...@apple.com>
Modified: tags/Safari-601.1.8/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (175729 => 175730)
--- tags/Safari-601.1.8/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-11-07 00:49:36 UTC (rev 175729)
+++ tags/Safari-601.1.8/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-11-07 00:53:38 UTC (rev 175730)
@@ -367,7 +367,7 @@
this.lastDoubleTouchTime = now;
} else {
var doubleTouchIntervalThresholdms = 300
- if (now - this.lastDoubleTouchTime < doubleTouchSpeedThreshold) {
+ if (now - this.lastDoubleTouchTime < doubleTouchIntervalThresholdms) {
delete this.lastDoubleTouchTime;
event.preventDefault();
this.host.enterFullscreenOptimized();
@@ -432,7 +432,7 @@
},
handleOptimizedFullscreenButtonClicked: function(event) {
- if (this.isFullenterFullscreenOptimizedScreen())
+ if (this.isFullScreen())
this.video.webkitExitFullscreen();
else
this.host.enterFullscreenOptimized();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
