Changeset 176090 in webkit

Timestamp:

Nov 13, 2014, 2:10:33 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[iOS] update optimized fullscreen media controls artwork
​https://bugs.webkit.org/show_bug.cgi?id=138705

Reviewed by Dean Jackson.

• Modules/mediacontrols/MediaControlsHost.cpp:

(WebCore::MediaControlsHost::mediaUIImageData): Remove one button.

• Modules/mediacontrols/MediaControlsHost.idl:

• Modules/mediacontrols/mediaControlsApple.js:

(Controller.prototype.controlsAreHidden): Add parentheses to fix the logic.

• Modules/mediacontrols/mediaControlsiOS.js:

(ControllerIOS.prototype.shouldHaveStartPlaybackButton): The big play button should not be

visible during playback.

(ControllerIOS.prototype.createControls): No longer necessary to insert style dynamically,
(ControllerIOS.prototype.setPlaying): Call the base class first so "isPlaying" is set before

calling updateControls, which calls shouldHaveStartPlaybackButton.

• platform/ios/WebCoreSystemInterfaceIOS.h: Update constants.

• rendering/RenderThemeIOS.mm:

(WebCore::RenderThemeIOS::mediaControlsStyleSheet): Add button style to the media controls sheet.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediacontrols/MediaControlsHost.cpp (modified) (1 diff)
• Modules/mediacontrols/MediaControlsHost.idl (modified) (1 diff)
• Modules/mediacontrols/mediaControlsApple.js (modified) (1 diff)
• Modules/mediacontrols/mediaControlsiOS.js (modified) (3 diffs)
• platform/ios/WebCoreSystemInterfaceIOS.h (modified) (1 diff)
• rendering/RenderThemeIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-13  Eric Carlson  <eric.carlson@apple.com>
+
+        [iOS] update optimized fullscreen media controls artwork
+        https://bugs.webkit.org/show_bug.cgi?id=138705
+
+        Reviewed by Dean Jackson.
+
+        * Modules/mediacontrols/MediaControlsHost.cpp:
+        (WebCore::MediaControlsHost::mediaUIImageData): Remove one button.
+        * Modules/mediacontrols/MediaControlsHost.idl:
+
+        * Modules/mediacontrols/mediaControlsApple.js:
+        (Controller.prototype.controlsAreHidden): Add parentheses to fix the logic.
+
+        * Modules/mediacontrols/mediaControlsiOS.js:
+        (ControllerIOS.prototype.shouldHaveStartPlaybackButton): The big play button should not be
+            visible during playback.
+        (ControllerIOS.prototype.createControls): No longer necessary to insert style dynamically,
+        (ControllerIOS.prototype.setPlaying): Call the base class first so "isPlaying" is set before
+            calling updateControls, which calls shouldHaveStartPlaybackButton.
+
+        * platform/ios/WebCoreSystemInterfaceIOS.h: Update constants.
+
+        * rendering/RenderThemeIOS.mm:
+        (WebCore::RenderThemeIOS::mediaControlsStyleSheet): Add button style to the media controls sheet.
+
 2014-11-13  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp

@@ -319 +319 @@
         return wkGetMediaUIImageData(wkMediaUIPartOptimizedFullscreenButton);
 
-    if (partID == "optimized-fullscreen-button-hilited")
-        return wkGetMediaUIImageData(wkMediaUIPartOptimizedFullscreenButtonHilited);
-
     if (partID == "optimized-fullscreen-placeholder")
         return wkGetMediaUIImageData(wkMediaUIPartOptimizedFullscreenPlaceholder);

trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl

@@ -38 +38 @@
 enum MediaUIPartID {
     "optimized-fullscreen-button",
-    "optimized-fullscreen-button-hilited",
     "optimized-fullscreen-placeholder"
 };

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

@@ -1049 +1049 @@
     controlsAreHidden: function()
     {
-        return !this.isAudio() && !this.controls.panel.classList.contains(this.ClassNames.show) || this.controls.panel.classList.contains(this.ClassNames.hidden);
+        return !this.isAudio() && (!this.controls.panel.classList.contains(this.ClassNames.show) || this.controls.panel.classList.contains(this.ClassNames.hidden));
     },
 

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

@@ -65 +65 @@
     shouldHaveStartPlaybackButton: function() {
         var allowsInline = this.host.mediaPlaybackAllowsInline;
+
+        if (this.isPlaying)
+            return false;
 
         if (this.isAudio() && allowsInline)
@@ -148 +151 @@
         inlinePlaybackPlaceholder.classList.add(this.ClassNames.hidden);
         inlinePlaybackPlaceholder.setAttribute('aria-label', this.UIString('Display Optimized Full Screen'));
-
-        var buttonImageSVG = "background-image: url('" + this.host.mediaUIImageData("optimized-fullscreen-button") + "')";
-        document.styleSheets[0].insertRule('video::-webkit-media-controls-optimized-fullscreen-button { ' + buttonImageSVG + '; }', 0);
-
-        buttonImageSVG = "background-image: url('" + this.host.mediaUIImageData("optimized-fullscreen-button-hilited") + "')";
-        document.styleSheets[0].insertRule('video::-webkit-media-controls-optimized-fullscreen-button:active { ' + buttonImageSVG + '; }', 0);
 
         var wirelessTargetPicker = this.controls.wirelessTargetPicker = document.createElement('button');
@@ -544 +541 @@
     setPlaying: function(isPlaying)
     {
+        Controller.prototype.setPlaying.call(this, isPlaying);
         this.updateControls();
-        Controller.prototype.setPlaying.call(this, isPlaying);
     },
 

trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h

@@ -78 +78 @@
 typedef enum {
     wkMediaUIPartOptimizedFullscreenButton = 0,
-    wkMediaUIPartOptimizedFullscreenButtonHilited,
     wkMediaUIPartOptimizedFullscreenPlaceholder
 } wkMediaUIPart;

trunk/Source/WebCore/rendering/RenderThemeIOS.mm

@@ -1252 +1252 @@
 {
 #if ENABLE(MEDIA_CONTROLS_SCRIPT)
-    if (m_mediaControlsStyleSheet.isEmpty())
-        m_mediaControlsStyleSheet = [NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsiOS" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil];
+    if (m_mediaControlsStyleSheet.isEmpty()) {
+        StringBuilder builder;
+        builder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsiOS" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil]);
+        builder.append(wkGetMediaUIImageData(wkMediaUIPartOptimizedFullscreenButton));
+        m_mediaControlsStyleSheet = builder.toString();
+    }
     return m_mediaControlsStyleSheet;
 #else