Title: [154621] branches/safari-537-branch
- Revision
- 154621
- Author
- [email protected]
- Date
- 2013-08-26 11:23:56 -0700 (Mon, 26 Aug 2013)
Log Message
Merged r154529. <rdar://problem/14816232>
Modified Paths
Added Paths
Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (154620 => 154621)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-08-26 18:18:57 UTC (rev 154620)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-08-26 18:23:56 UTC (rev 154621)
@@ -1,3 +1,17 @@
+2013-08-26 Lucas Forschler <[email protected]>
+
+ Merge r154529
+
+ 2013-08-23 Jer Noble <[email protected]>
+
+ REGRESSION (r150516): Media controls are messed up on right-to-left webpages
+ https://bugs.webkit.org/show_bug.cgi?id=120234
+
+ Reviewed by Dan Bernstein.
+
+ * media/video-rtl-expected.html: Added.
+ * media/video-rtl.html: Added.
+
2013-08-16 Lucas Forschler <[email protected]>
Merge r154147
Copied: branches/safari-537-branch/LayoutTests/media/video-rtl-expected.html (from rev 154529, trunk/LayoutTests/media/video-rtl-expected.html) (0 => 154621)
--- branches/safari-537-branch/LayoutTests/media/video-rtl-expected.html (rev 0)
+++ branches/safari-537-branch/LayoutTests/media/video-rtl-expected.html 2013-08-26 18:23:56 UTC (rev 154621)
@@ -0,0 +1,18 @@
+<html>
+<head>
+ <script src=""
+ <script>
+ var requirePixelDump = true;
+
+ function start() {
+ findMediaElement();
+ video.src = "" 'content/test');
+ video.addEventListener('canplaythrough', endTest, false);
+ }
+ </script>
+ <script src=""
+</head>
+<body _onload_="start()">
+ <video controls></video>
+</body>
+</html>
\ No newline at end of file
Copied: branches/safari-537-branch/LayoutTests/media/video-rtl.html (from rev 154529, trunk/LayoutTests/media/video-rtl.html) (0 => 154621)
--- branches/safari-537-branch/LayoutTests/media/video-rtl.html (rev 0)
+++ branches/safari-537-branch/LayoutTests/media/video-rtl.html 2013-08-26 18:23:56 UTC (rev 154621)
@@ -0,0 +1,21 @@
+<html>
+<head>
+ <script src=""
+ <script>
+ var requirePixelDump = true;
+
+ function start() {
+ findMediaElement();
+ video.src = "" 'content/test');
+ video.addEventListener('canplaythrough', endTest, false);
+ }
+ </script>
+ <script src=""
+ <style>
+ video { direction: rtl; }
+ </style>
+</head>
+<body _onload_="start()">
+ <video controls></video>
+</body>
+</html>
\ No newline at end of file
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (154620 => 154621)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-26 18:18:57 UTC (rev 154620)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-26 18:23:56 UTC (rev 154621)
@@ -1,5 +1,24 @@
2013-08-26 Lucas Forschler <[email protected]>
+ Merge r154529
+
+ 2013-08-23 Jer Noble <[email protected]>
+
+ REGRESSION (r150516): Media controls are messed up on right-to-left webpages
+ https://bugs.webkit.org/show_bug.cgi?id=120234
+
+ Reviewed by Dan Bernstein.
+
+ Test: media/video-rtl.html
+
+ Make the media control panel explicitly direction:ltr. The captions menu and captions
+ display are unaffected, so rtl content will continue to appear rtl there.
+
+ * css/mediaControls.css:
+ (audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel):
+
+2013-08-26 Lucas Forschler <[email protected]>
+
Merge r154535
2013-08-23 Simon Fraser <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/css/mediaControls.css (154620 => 154621)
--- branches/safari-537-branch/Source/WebCore/css/mediaControls.css 2013-08-26 18:18:57 UTC (rev 154620)
+++ branches/safari-537-branch/Source/WebCore/css/mediaControls.css 2013-08-26 18:23:56 UTC (rev 154621)
@@ -45,6 +45,7 @@
audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel {
display: -webkit-flex;
+ direction: ltr;
-webkit-flex-direction: row;
-webkit-align-items: center;
-webkit-user-select: none;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
