Skip to site navigation (Press enter)

[webkit-changes] [181062] trunk/Source/WebCore

commit-queue Wed, 04 Mar 2015 18:28:19 -0800

Title: [181062] trunk/Source/WebCore

Revision: 181062
Author: [email protected]
Date: 2015-03-04 18:27:44 -0800 (Wed, 04 Mar 2015)

Log Message

Unreviewed, rolling out r181046.
https://bugs.webkit.org/show_bug.cgi?id=142318


Broke two layout tests (Requested by sundiamonde on #webkit).

Reverted changeset:

"Update inline media control icons for OSX."
https://bugs.webkit.org/show_bug.cgi?id=142305
http://trac.webkit.org/changeset/181046

Modified Paths

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

Diff

Modified: trunk/Source/WebCore/ChangeLog (181061 => 181062)


--- trunk/Source/WebCore/ChangeLog	2015-03-05 02:27:23 UTC (rev 181061)
+++ trunk/Source/WebCore/ChangeLog	2015-03-05 02:27:44 UTC (rev 181062)
@@ -1,3 +1,16 @@
+2015-03-04  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r181046.
+        https://bugs.webkit.org/show_bug.cgi?id=142318
+
+        Broke two layout tests (Requested by sundiamonde on #webkit).
+
+        Reverted changeset:
+
+        "Update inline media control icons for OSX."
+        https://bugs.webkit.org/show_bug.cgi?id=142305
+        http://trac.webkit.org/changeset/181046
+
 2015-03-04  Timothy Horton  <[email protected]>
 
         <attachment> icons are low-resolution when transformed or under page scale

Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (181061 => 181062)


--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css	2015-03-05 02:27:23 UTC (rev 181061)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css	2015-03-05 02:27:44 UTC (rev 181062)
@@ -106,7 +106,8 @@
     display: block;
     padding: 0;
     border: 0;
-    height: 15px;
+    height: 16px;
+    width: 16px;
     background-color: transparent;
     color: white;
     background-origin: content-box;
@@ -126,26 +127,24 @@
     width: 16px;
     height: 18px;
     margin-bottom: 1px;
-    margin-left: 16px;
+    margin-left: 8px;
 }
 
 video::-webkit-media-controls-play-button,
 audio::-webkit-media-controls-play-button {
-    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 15" fill="white"><rect x="0" y="1" width="4" height="12"/><rect x="8" y="1" width="4" height="12"/></svg>');
+    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><linearGradient id="gradient" x2="0" y2="100%" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(200, 200, 200)"/><stop offset="1" stop-color="rgb(208, 208, 208)"/></linearGradient><path d="M 0,0 v 16 h 6 v -16 h -6 z" fill="url(#gradient)"/><path d="M 9,0 v 16 h 6 v -16 h -6 z" fill="url(#gradient)"/></svg>');
     margin-left: 16px;
-    width: 12px;
 }
 
 video::-webkit-media-controls-play-button.paused,
 audio::-webkit-media-controls-play-button.paused {
-    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 15" fill="white"><path d="M 0,1 11,7 0,13 z"/></svg>');
-    width: 12px;
+    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><linearGradient id="gradient" x2="0" y2="100%" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(200, 200, 200)"/><stop offset="1" stop-color="rgb(208, 208, 208)"/></linearGradient><path d="M 0,0 15,7 0,15 z" fill="url(#gradient)"/></svg>');
 }
 
 video::-webkit-media-controls-panel .mute-box,
 audio::-webkit-media-controls-panel .mute-box {
-    width: 14px;
-    height: 15px;
+    width: 16px;
+    height: 16px;
     margin-right: 16px;
     position: relative;
     display: -webkit-flex;
@@ -157,8 +156,7 @@
 video::-webkit-media-controls-mute-button,
 audio::-webkit-media-controls-mute-button,
 video::-webkit-media-controls-volume-max-button {
-    width: 14px;
-    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" stroke="white" fill="none" stroke-width="1.25" stroke-linecap="round"><path fill="white" stroke="rgba(255,255,255,0.67)" d="M 0,9 0,5 3,5 6,2 6,12 3,9 0,9 z"/><path d="M 9,5 C 10.75,6.5 10.75,7.5 9,9"/><path d="M 10,3 C 13,4 13,10 10,11" /><path d="M 11,1 C 15.67,3 15.67,11 11,13"/></svg>');
+    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><linearGradient id="gradient" x2="0" y2="100%" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(200, 200, 200)"/><stop offset="1" stop-color="rgb(208, 208, 208)"/></linearGradient><path d="m 0,9 0,-4 3,0 3,-3 0,10 -3,-3 -3,0 z" style="fill:url(#gradient) "/><path d="m 10.449,1.087 c 1.963,1.055 3.322,3.291 3.322,5.881 0,2.642 -1.402,4.913 -3.424,5.945" style="fil
 l:none;stroke:url(#gradient);stroke-width:1.25;stroke-linecap:round;"/><path d="m 9.13,3.134 c 1.289,0.681 2.181,2.142 2.181,3.835 0,1.743001 -0.939,3.24 -2.285,3.897" style="fill:none;stroke:url(#gradient);stroke-width:1.25;stroke-linecap:round;"/><path d="M 7.794,5.175 C 8.403001,5.491 8.827001,6.167 8.827001,6.971 8.827001,7.818 8.356,8.537001 7.688,8.826" style="fill:none;stroke:url(#gradient);stroke-width:1.25;stroke-linecap:round;"/></svg>');
 }
 
 video::-webkit-media-controls-panel .volume-box,
@@ -223,14 +221,15 @@
 video::-webkit-media-controls-mute-button.muted,
 audio::-webkit-media-controls-mute-button.muted,
 video::-webkit-media-controls-volume-min-button {
-    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" ><path fill="white" stroke="rgba(255,255,255,0.67)" d="M 0,9 0,5 3,5 6,2 6,12 3,9 0,9 z"/></svg>');
+    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><linearGradient id="gradient" x2="0" y2="100%" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(200, 200, 200)"/><stop offset="1" stop-color="rgb(208, 208, 208)"/></linearGradient><path d="m 0,9 0,-4 3,0 3,-3 0,10 -3,-3 -3,0 z" fill="url(#gradient)"/></svg>');
 }
 
 video::-webkit-media-controls-toggle-closed-captions-button,
 audio::-webkit-media-controls-toggle-closed-captions-button {
-    width: 15px;
+    width: 16px;
+    height: 16px;
     margin-right: 16px;
-    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 102 105" fill="white"><path d="M98.766,43.224c0-23.163-21.775-41.94-48.637-41.94c-26.859,0-48.635,18.777-48.635,41.94c0,18.266,13.546,33.796,32.444,39.549c1.131,8.356,26.037,24.255,22.864,19.921c-4.462-6.096-5.159-13.183-5.07-17.566C77.85,84.397,98.766,65.923,98.766,43.224z" fill="url(#gradient)"/></svg>');
+    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 102 105"><linearGradient id="gradient" x2="0" y2="100%" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="rgb(216, 216, 216)"/><stop offset="0.46875" stop-color="rgb(216, 216, 216)"/><stop offset="0.46875" stop-color="rgb(208, 208, 208)"/><stop offset="0.53125" stop-color="rgb(208, 208, 208)"/><stop offset="0.53125" stop-color="rgb(200, 200, 200)"/><stop offset="1" stop-color="rgb(208, 208, 208)"/></linearGradient><path d="M98.766,43.224c0-23.163-21.775-41.94-48.637-41.94c-26.859,0-48.635,18.777-48.635,41.94c0,18.266,13.546,33.796,32.444,39.549c1.131,8.356,26.037,24.255,22.864,19.921c-4.462-6.096-5.159-13.183-5.07-17.56
 6C77.85,84.397,98.766,65.923,98.766,43.224z" fill="url(#gradient)"/></svg>');
     outline: 0;
 }
 
@@ -332,9 +331,8 @@
 
 video::-webkit-media-controls-fullscreen-button,
 audio::-webkit-media-controls-fullscreen-button {
-    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 13 15" transform="rotate(90,0,0)" stroke="white" shape-rendering="geometricPrecision"><path d="M 6.5,1.5 L 11.5,1.5 L  11.5,6.5 M 11.5,1.5 L 6.75,6.25"/><path d="M 0.5,7.5 L 0.5,12.5 L 5.5,12.5 M 0.5,12.5 L 5.25,7.75"/></svg>');
+    background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15" transform="rotate(90,0,0)"><linearGradient id="gradient" x2="0" y2="100%" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(216, 216, 216)"/><stop offset="0.4375" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(208, 208, 208)"/><stop offset="0.5" stop-color="rgb(200, 200, 200)"/><stop offset="1" stop-color="rgb(208, 208, 208)"/></linearGradient><path d="M 14,1 m 0,6 -2,-2 -2,2 c 0,0 -1,1 -2,0 -1,-1 0,-2 0,-2 l 2,-2 -2,-2 6,0 z" style="fill:url(#gradient) "/><path d="M 1,14 m 0,-6 2,2 2,-2 c 0,0 1,-1 
 2,0 1,1 0,2 0,2 l -2,2 2,2 -6,0 z" style="fill:url(#gradient) "/></svg>');
     margin-right: 8px;
-    width: 13px;
 }
 video::-webkit-media-controls-fullscreen-button.exit,
 audio::-webkit-media-controls-fullscreen-button.exit {
@@ -408,7 +406,7 @@
 
 video::-webkit-media-controls-current-time-display,
 audio::-webkit-media-controls-current-time-display {
-    margin-left: 8px;
+    margin-left: 16px;
     margin-right: 8px;
     width: 28px;
     min-width: 28px;

Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (181061 => 181062)


--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js	2015-03-05 02:27:23 UTC (rev 181061)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js	2015-03-05 02:27:44 UTC (rev 181062)
@@ -459,9 +459,9 @@
 
     configureInlineControls: function()
     {
-        this.controls.panel.appendChild(this.controls.playButton);
         if (!this.isLive)
             this.controls.panel.appendChild(this.controls.rewindButton);
+        this.controls.panel.appendChild(this.controls.playButton);
         this.controls.panel.appendChild(this.controls.statusDisplay);
         if (!this.isLive) {
             this.controls.panel.appendChild(this.controls.timelineBox);
@@ -833,7 +833,6 @@
         this.video.muted = !this.video.muted;
         if (this.video.muted)
             this.controls.muteButton.setAttribute('aria-label', this.UIString('Unmute'));
-        this.drawVolumeBackground();
         return true;
     },
 
@@ -1565,7 +1564,6 @@
             this.controls.muteButton.classList.remove(this.ClassNames.muted);
             this.controls.volume.value = this.video.volume;
         }
-        this.drawVolumeBackground();
     },
 
     isAudio: function()

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes