[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
commit-queue at webkit.org
commit-queue at webkit.org
Fri Jan 21 14:36:51 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit aa3bc39b6f5c4201b19473f1ace0a569ef883841
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 23 05:25:36 2010 +0000
2010-12-22 Steve Lacey <sjl at chromium.org>
Reviewed by David Levin.
Change css for chromium media controls to deal with the timeline
not expanding when the current time disappears. This happens when
the width of the control drops below 240px.
This change results in a minor pixel difference - the timebar now
aligns better with the time and when the time is not displayed is
now perfectly centered. Disabling the affected tests for now
and will rebaseline.
https://bugs.webkit.org/show_bug.cgi?id=51500
* platform/chromium/test_expectations.txt:
2010-12-22 Steve Lacey <sjl at chromium.org>
Reviewed by David Levin.
Change css for chromium media controls to deal with the timeline
not expanding when the current time disappears. This happens when
the width of the control drops below 240px.
This change results in a minor pixel difference - the timebar now
aligns better with the time and when the time is not displayed is
now perfectly centered. Disabling the affected tests for now
and will rebaseline.
https://bugs.webkit.org/show_bug.cgi?id=51500
* css/mediaControlsChromium.css:
(audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container):
(audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display):
(audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display):
(audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74535 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e622e70..d2002fb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-12-22 Steve Lacey <sjl at chromium.org>
+
+ Reviewed by David Levin.
+
+ Change css for chromium media controls to deal with the timeline
+ not expanding when the current time disappears. This happens when
+ the width of the control drops below 240px.
+
+ This change results in a minor pixel difference - the timebar now
+ aligns better with the time and when the time is not displayed is
+ now perfectly centered. Disabling the affected tests for now
+ and will rebaseline.
+
+ https://bugs.webkit.org/show_bug.cgi?id=51500
+
+ * platform/chromium/test_expectations.txt:
+
2010-12-22 Mihai Parparita <mihaip at chromium.org>
Unreviewed test expectations update. fast/canvas/fillText-shadow.html
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 6d5406f..8c23b58 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3209,7 +3209,8 @@ BUGCR66085 LINUX : media/constructors.html = PASS TIMEOUT
BUGCR66085 : media/remove-from-document.html = PASS TIMEOUT
BUGCR66085 WIN : media/video-currentTime.html = TIMEOUT
BUGCR66085 LINUX : media/video-currentTime.html = PASS TIMEOUT
-BUGCR66085 : media/video-display-toggle.html = PASS TIMEOUT
+// Re-enable this once 59704 is fixed (rebaselined).
+//BUGCR66085 : media/video-display-toggle.html = PASS TIMEOUT
BUGCR66085 : media/video-play-pause-exception.html = PASS TIMEOUT
BUGCR66085 : media/video-source.html = PASS TIMEOUT
BUGCR66085 : media/video-source-moved.html = PASS TIMEOUT
@@ -3263,3 +3264,15 @@ BUGCR67442 WIN LINUX : fast/canvas/fillText-shadow.html = TEXT
BUGWK51398 MAC : inspector/console-dir-global.html = TIMEOUT
BUGWK51398 MAC : inspector/debugger-expand-scope.html = TIMEOUT
+
+// Change for 59704 requires a rebaseline of various media tests
+BUGCR59704 : media/audio-controls-rendering.html = IMAGE+TEXT
+BUGCR59704 : media/controls-after-reload.html = IMAGE+TEXT
+BUGCR59704 : media/controls-strict.html = IMAGE+TEXT
+BUGCR59704 : media/controls-styling.html = IMAGE+TEXT
+BUGCR59704 : media/controls-without-preload.html = IMAGE+TEXT
+BUGCR59704 : media/video-controls-rendering.html = IMAGE+TEXT
+BUGCR59704 : media/video-display-toggle.html = IMAGE+TEXT TIMEOUT
+BUGCR59704 : media/video-empty-source.html = IMAGE+TEXT
+BUGCR59704 : media/video-no-audio.html = IMAGE+TEXT
+BUGCR59704 : media/video-volume-slider.html = IMAGE+TEXT
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6d3e08f..527716f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-12-22 Steve Lacey <sjl at chromium.org>
+
+ Reviewed by David Levin.
+
+ Change css for chromium media controls to deal with the timeline
+ not expanding when the current time disappears. This happens when
+ the width of the control drops below 240px.
+
+ This change results in a minor pixel difference - the timebar now
+ aligns better with the time and when the time is not displayed is
+ now perfectly centered. Disabling the affected tests for now
+ and will rebaseline.
+
+ https://bugs.webkit.org/show_bug.cgi?id=51500
+
+ * css/mediaControlsChromium.css:
+ (audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container):
+ (audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display):
+ (audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-controls-time-remaining-display):
+ (audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline):
+
2010-12-22 Mihai Parparita <mihaip at chromium.org>
Reviewed by Simon Fraser.
diff --git a/WebCore/css/mediaControlsChromium.css b/WebCore/css/mediaControlsChromium.css
index 871a324..61cbb0d 100644
--- a/WebCore/css/mediaControlsChromium.css
+++ b/WebCore/css/mediaControlsChromium.css
@@ -73,6 +73,11 @@ audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-bu
audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-timeline-container {
-webkit-appearance: media-timeline-container;
-webkit-user-select: none;
+ -webkit-box-orient: horizontal;
+ -webkit-box-align: center;
+ -webkit-box-pack: center;
+ -webkit-box-direction: reverse;
+ -webkit-box-flex: 1;
position: absolute;
top: auto;
@@ -90,18 +95,15 @@ audio::-webkit-media-controls-timeline-container, video::-webkit-media-controls-
audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display {
-webkit-appearance: media-current-time-display;
-webkit-user-select: none;
- display: inline-block;
+ display: -webkit-box;
+ -webkit-box-flex: 0;
+ -webkit-box-pack: center;
+ -webkit-box-align: center;
overflow: hidden;
cursor: default;
- position: absolute;
line-height: 21px;
- top: auto;
- bottom: 6px;
- left: auto;
- right: 0px;
-
height: 20px;
width: 58px;
@@ -123,17 +125,14 @@ audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-contr
-webkit-appearance: media-time-remaining-display;
-webkit-user-select: none;
display: none;
+ -webkit-box-flex: 0;
+ -webkit-box-pack: center;
+ -webkit-box-align: center;
overflow: hidden;
cursor: default;
- position: absolute;
line-height: 21px;
- top: auto;
- bottom: 6px;
- left: auto;
- right: 0px;
-
height: 20px;
width: 58px;
@@ -153,11 +152,11 @@ audio::-webkit-media-controls-time-remaining-display, video::-webkit-media-contr
audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline {
-webkit-appearance: media-slider;
- position: absolute;
- top: auto;
- bottom: 7px;
- left: 6px;
- right: 65px;
+ display: -webkit-box;
+ -webkit-box-flex: 1;
+
+ padding: 0px;
+ margin: 0px 6px;
height: 16px;
border-color: rgba(255, 255, 255, 0.2);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list