Title: [219564] trunk
- Revision
- 219564
- Author
- grao...@webkit.org
- Date
- 2017-07-17 11:10:05 -0700 (Mon, 17 Jul 2017)
Log Message
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.
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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (219563 => 219564)
--- trunk/LayoutTests/ChangeLog 2017-07-17 17:56:23 UTC (rev 219563)
+++ trunk/LayoutTests/ChangeLog 2017-07-17 18:10:05 UTC (rev 219564)
@@ -1,5 +1,18 @@
2017-07-17 Antoine Quint <grao...@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 <grao...@apple.com>
+
Media controls draw behind captions
https://bugs.webkit.org/show_bug.cgi?id=174579
<rdar://problem/33295427>
Modified: trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons-expected.txt (219563 => 219564)
--- trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons-expected.txt 2017-07-17 17:56:23 UTC (rev 219563)
+++ trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons-expected.txt 2017-07-17 18:10:05 UTC (rev 219564)
@@ -6,8 +6,8 @@
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
Modified: trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons.html (219563 => 219564)
--- trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons.html 2017-07-17 17:56:23 UTC (rev 219563)
+++ trunk/LayoutTests/media/modern-media-controls/audio/audio-controls-buttons.html 2017-07-17 18:10:05 UTC (rev 219564)
@@ -43,8 +43,8 @@
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");
Modified: trunk/Source/WebCore/ChangeLog (219563 => 219564)
--- trunk/Source/WebCore/ChangeLog 2017-07-17 17:56:23 UTC (rev 219563)
+++ trunk/Source/WebCore/ChangeLog 2017-07-17 18:10:05 UTC (rev 219564)
@@ -1,3 +1,18 @@
+2017-07-17 Antoine Quint <grao...@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 <annu...@yandex.ru>
[CMake] Create targets before WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS is called
Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/inline-media-controls.js (219563 => 219564)
--- trunk/Source/WebCore/Modules/modern-media-controls/controls/inline-media-controls.js 2017-07-17 17:56:23 UTC (rev 219563)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/inline-media-controls.js 2017-07-17 18:10:05 UTC (rev 219564)
@@ -253,7 +253,7 @@
_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];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
