Changeset 179689 in webkit

Timestamp:

Feb 5, 2015, 5:34:41 AM (12 years ago)

Author:

dino@apple.com

Message:

[Media iOS] Add a debug setting to always show the optimized fullscreen button
​https://bugs.webkit.org/show_bug.cgi?id=141277
<rdar://problem/19724471>

Reviewed by Eric Carlson.

Add a debug option so that we can test the optimized fullscreen
control on media that doesn't support it.

• Modules/mediacontrols/mediaControlsiOS.js: Add gSimulateOptimizedFullscreenAvailable.

(ControllerIOS.prototype.createControls): Check the setting.
(ControllerIOS.prototype.configureInlineControls): Ditto.
(ControllerIOS.prototype.formatTime): Drive-by whitespace cleanup.
(ControllerIOS.prototype.handleBaseGestureChange):
(ControllerIOS.prototype.handleWrapperTouchStart):
(ControllerIOS.prototype.handleOptimizedFullscreenTouchEnd):
(ControllerIOS.prototype.handlePresentationModeChange): Drive-by variable renaming.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediacontrols/mediaControlsiOS.js (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-04  Dean Jackson  <dino@apple.com>
+
+        [Media iOS] Add a debug setting to always show the optimized fullscreen button
+        https://bugs.webkit.org/show_bug.cgi?id=141277
+        <rdar://problem/19724471>
+
+        Reviewed by Eric Carlson.
+
+        Add a debug option so that we can test the optimized fullscreen
+        control on media that doesn't support it.
+
+        * Modules/mediacontrols/mediaControlsiOS.js: Add gSimulateOptimizedFullscreenAvailable.
+        (ControllerIOS.prototype.createControls): Check the setting.
+        (ControllerIOS.prototype.configureInlineControls): Ditto.
+        (ControllerIOS.prototype.formatTime): Drive-by whitespace cleanup.
+        (ControllerIOS.prototype.handleBaseGestureChange):
+        (ControllerIOS.prototype.handleWrapperTouchStart):
+        (ControllerIOS.prototype.handleOptimizedFullscreenTouchEnd):
+        (ControllerIOS.prototype.handlePresentationModeChange): Drive-by variable renaming.
+
 2015-02-05  Youenn Fablet  <youenn.fablet@crf.canon.fr> and Xabier Rodriguez Calvar <calvaris@igalia.com>
 

trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js

@@ -26 +26 @@
 ControllerIOS.gWirelessImage = 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 245"><g fill="#1060FE"><path d="M193.6,6.3v121.6H6.4V6.3H193.6 M199.1,0.7H0.9v132.7h198.2V0.7L199.1,0.7z"/><path d="M43.5,139.3c15.8,8,35.3,12.7,56.5,12.7s40.7-4.7,56.5-12.7H43.5z"/></g><g text-anchor="middle" font-family="Helvetica Neue"><text x="100" y="204" fill="white" font-size="24">##DEVICE_TYPE##</text><text x="100" y="234" fill="#5C5C5C" font-size="21">##DEVICE_NAME##</text></g></svg>';
 ControllerIOS.gSimulateWirelessPlaybackTarget = false; // Used for testing when there are no wireless targets.
+ControllerIOS.gSimulateOptimizedFullscreenAvailable = false; // Used for testing when optimized fullscreen is not available.
 
 ControllerIOS.prototype = {
@@ -151 +152 @@
         var inlinePlaybackPlaceholder = this.controls.inlinePlaybackPlaceholder = document.createElement('div');
         inlinePlaybackPlaceholder.setAttribute('pseudo', '-webkit-media-controls-inline-playback-placeholder');
-        inlinePlaybackPlaceholder.classList.add(this.ClassNames.hidden);
+        if (!ControllerIOS.gSimulateOptimizedFullscreenAvailable)
+            inlinePlaybackPlaceholder.classList.add(this.ClassNames.hidden);
         inlinePlaybackPlaceholder.setAttribute('aria-label', this.UIString('Display Optimized Full Screen'));
 
@@ -224 +226 @@
         }
         if (!this.isAudio()) {
-            if ('webkitSupportsPresentationMode' in this.video && this.video.webkitSupportsPresentationMode('optimized'))
+            if (ControllerIOS.gSimulateOptimizedFullscreenAvailable || ('webkitSupportsPresentationMode' in this.video && this.video.webkitSupportsPresentationMode('optimized')))
                 this.controls.panel.appendChild(this.controls.optimizedFullscreenButton);
             this.controls.panel.appendChild(this.controls.fullscreenButton);
@@ -343 +345 @@
         if (!this.video.controls || this.isAudio() || this.isFullScreen() || this.gestureStartTime === undefined || this.controlsType == ControllerIOS.StartPlaybackControls)
             return;
-        
+
         var scaleDetectionThreshold = 0.2;
         if (event.scale > 1 + scaleDetectionThreshold || event.scale < 1 - scaleDetectionThreshold)
@@ -357 +359 @@
 
         var velocity = Math.abs(event.scale - 1) / duration;
-        
+
         var pinchOutVelocityThreshold = 2;
         var pinchOutGestureScaleThreshold = 1.25;
@@ -376 +378 @@
 
         this.mostRecentNumberOfTargettedTouches = event.targetTouches.length;
-        
+
         if (this.controlsAreHidden()) {
             this.showControls();
@@ -459 +461 @@
             this.video.webkitSetPresentationMode('optimized');
     },
-        
+
     handleOptimizedFullscreenTouchStart: function() {
         this.controls.optimizedFullscreenButton.classList.add('active');
     },
-        
+
     handleOptimizedFullscreenTouchEnd: function(event) {
         this.controls.optimizedFullscreenButton.classList.remove('active');
-        
+
         this.handleOptimizedFullscreenButtonClicked();
-        
-        return true;
-    },
-        
+
+        return true;
+    },
+
     handleOptimizedFullscreenTouchCancel: function(event) {
         this.controls.optimizedFullscreenButton.classList.remove('active');
@@ -613 +615 @@
                 break;
             case 'optimized':
-                var backgroundImageSVG = "url('" + this.host.mediaUIImageData("optimized-fullscreen-placeholder") + "')";
-                this.controls.inlinePlaybackPlaceholder.style.backgroundImage = backgroundImageSVG;
+                var backgroundImage = "url('" + this.host.mediaUIImageData("optimized-fullscreen-placeholder") + "')";
+                this.controls.inlinePlaybackPlaceholder.style.backgroundImage = backgroundImage;
                 this.controls.inlinePlaybackPlaceholder.setAttribute('aria-label', "video playback placeholder");
                 this.controls.inlinePlaybackPlaceholder.classList.remove(this.ClassNames.hidden);