REGRESSION: order of AirPlay and volume controls is inconsistent between <audio>...
authorgraouts@webkit.org <graouts@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jul 2017 18:10:05 +0000 (18:10 +0000)
committergraouts@webkit.org <graouts@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jul 2017 18:10:05 +0000 (18:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=174581
<rdar://problem/33297519>

Reviewed by Sam Weinig.

Source/WebCore:

We had an inconsistency between <audio> and <video> controls for the relative order of the
volume and AirPlay buttons. The <video> layout was correct (volume first and AirPlay after)
and the <audio> layout now is the same.

* Modules/modern-media-controls/controls/inline-media-controls.js:
(InlineMediaControls.prototype._rightContainerButtons):

LayoutTests:

Update the audio controls layout test to match the new expectations.

* media/modern-media-controls/audio/audio-controls-buttons-expected.txt:
* media/modern-media-controls/audio/audio-controls-buttons.html:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219564 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/media/modern-media-controls/audio/audio-controls-buttons-expected.txt
LayoutTests/media/modern-media-controls/audio/audio-controls-buttons.html
Source/WebCore/ChangeLog
Source/WebCore/Modules/modern-media-controls/controls/inline-media-controls.js

index ed292a0..bf991f6 100644 (file)
@@ -1,5 +1,18 @@
 2017-07-17  Antoine Quint  <graouts@apple.com>
 
+        REGRESSION: order of AirPlay and volume controls is inconsistent between <audio> and <video>
+        https://bugs.webkit.org/show_bug.cgi?id=174581
+        <rdar://problem/33297519>
+
+        Reviewed by Sam Weinig.
+
+        Update the audio controls layout test to match the new expectations.
+
+        * media/modern-media-controls/audio/audio-controls-buttons-expected.txt:
+        * media/modern-media-controls/audio/audio-controls-buttons.html:
+
+2017-07-17  Antoine Quint  <graouts@apple.com>
+
         Media controls draw behind captions
         https://bugs.webkit.org/show_bug.cgi?id=174579
         <rdar://problem/33295427>
index e236d03..024eca0 100644 (file)
@@ -6,8 +6,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 Making AirPlay routes available.
 AirPlay routes became available.
 PASS mediaController.controls.rightContainer.children.length is 2
-PASS mediaController.controls.rightContainer.children[0] is mediaController.controls.airplayButton
-PASS mediaController.controls.rightContainer.children[1] is mediaController.controls.muteButton
+PASS mediaController.controls.rightContainer.children[0] is mediaController.controls.muteButton
+PASS mediaController.controls.rightContainer.children[1] is mediaController.controls.airplayButton
 PASS accessibilityController.accessibleElementById('audio-controls').description is "AXDescription: Audio Controls"
 
 PASS successfullyParsed is true
index d7764b7..061ee0b 100644 (file)
@@ -43,8 +43,8 @@ function playbackTargetAvailabilityChangedAgain(event)
     media.removeEventListener('webkitplaybacktargetavailabilitychanged', playbackTargetAvailabilityChangedAgain, true);
 
     shouldBe("mediaController.controls.rightContainer.children.length", "2");
-    shouldBe("mediaController.controls.rightContainer.children[0]", "mediaController.controls.airplayButton");
-    shouldBe("mediaController.controls.rightContainer.children[1]", "mediaController.controls.muteButton");
+    shouldBe("mediaController.controls.rightContainer.children[0]", "mediaController.controls.muteButton");
+    shouldBe("mediaController.controls.rightContainer.children[1]", "mediaController.controls.airplayButton");
     mediaController.controls.bottomControlsBar.element.setAttribute("id", "audio-controls");
 
     shouldBeEqualToString("accessibilityController.accessibleElementById('audio-controls').description", "AXDescription: Audio Controls");
index ac41cb0..42affd3 100644 (file)
@@ -1,3 +1,18 @@
+2017-07-17  Antoine Quint  <graouts@apple.com>
+
+        REGRESSION: order of AirPlay and volume controls is inconsistent between <audio> and <video>
+        https://bugs.webkit.org/show_bug.cgi?id=174581
+        <rdar://problem/33297519>
+
+        Reviewed by Sam Weinig.
+
+        We had an inconsistency between <audio> and <video> controls for the relative order of the
+        volume and AirPlay buttons. The <video> layout was correct (volume first and AirPlay after)
+        and the <audio> layout now is the same.
+
+        * Modules/modern-media-controls/controls/inline-media-controls.js:
+        (InlineMediaControls.prototype._rightContainerButtons):
+
 2017-07-17  Konstantin Tokarev  <annulen@yandex.ru>
 
         [CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
index 24d02b4..3bae7a9 100644 (file)
@@ -253,7 +253,7 @@ class InlineMediaControls extends MediaControls
     _rightContainerButtons()
     {
         if (this._shouldUseAudioLayout)
-            return [this.airplayButton, this.muteButton];
+            return [this.muteButton, this.airplayButton];
 
         if (this._shouldUseSingleBarLayout)
             return [this.muteButton, this.airplayButton, this.pipButton, this.tracksButton, this.fullscreenButton];