Changeset 181062 in webkit


Ignore:
Timestamp:
Mar 4, 2015 6:27:44 PM (9 years ago)
Author:
commit-queue@webkit.org
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

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r181058 r181062  
     12015-03-04  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r181046.
     4        https://bugs.webkit.org/show_bug.cgi?id=142318
     5
     6        Broke two layout tests (Requested by sundiamonde on #webkit).
     7
     8        Reverted changeset:
     9
     10        "Update inline media control icons for OSX."
     11        https://bugs.webkit.org/show_bug.cgi?id=142305
     12        http://trac.webkit.org/changeset/181046
     13
    1142015-03-04  Timothy Horton  <timothy_horton@apple.com>
    215

  • trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css

    r181046 r181062  
    107107    padding: 0;
    108108    border: 0;
    109     height: 15px;
     109    height: 16px;
     110    width: 16px;
    110111    background-color: transparent;
    111112    color: white;
    … …  
    127128    height: 18px;
    128129    margin-bottom: 1px;
    129     margin-left: 16px;
     130    margin-left: 8px;
    130131}
    131132
    132133video::-webkit-media-controls-play-button,
    133134audio::-webkit-media-controls-play-button {
    134     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>');
     135    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>');
    135136    margin-left: 16px;
    136     width: 12px;
    137137}
    138138
    139139video::-webkit-media-controls-play-button.paused,
    140140audio::-webkit-media-controls-play-button.paused {
    141     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>');
    142     width: 12px;
     141    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>');
    143142}
    144143
    145144video::-webkit-media-controls-panel .mute-box,
    146145audio::-webkit-media-controls-panel .mute-box {
    147     width: 14px;
    148     height: 15px;
     146    width: 16px;
     147    height: 16px;
    149148    margin-right: 16px;
    150149    position: relative;
    … …  
    158157audio::-webkit-media-controls-mute-button,
    159158video::-webkit-media-controls-volume-max-button {
    160     width: 14px;
    161     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>');
     159    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="fill: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>');
    162160}
    163161
    … …  
    224222audio::-webkit-media-controls-mute-button.muted,
    225223video::-webkit-media-controls-volume-min-button {
    226     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>');
     224    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>');
    227225}
    228226
    229227video::-webkit-media-controls-toggle-closed-captions-button,
    230228audio::-webkit-media-controls-toggle-closed-captions-button {
    231     width: 15px;
     229    width: 16px;
     230    height: 16px;
    232231    margin-right: 16px;
    233     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>');
     232    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.566C77.85,84.397,98.766,65.923,98.766,43.224z" fill="url(#gradient)"/></svg>');
    234233    outline: 0;
    235234}
    … …  
    333332video::-webkit-media-controls-fullscreen-button,
    334333audio::-webkit-media-controls-fullscreen-button {
    335     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>');
     334    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>');
    336335    margin-right: 8px;
    337     width: 13px;
    338336}
    339337video::-webkit-media-controls-fullscreen-button.exit,
    … …  
    409407video::-webkit-media-controls-current-time-display,
    410408audio::-webkit-media-controls-current-time-display {
    411     margin-left: 8px;
     409    margin-left: 16px;
    412410    margin-right: 8px;
    413411    width: 28px;

  • trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js

    r181046 r181062  
    460460    configureInlineControls: function()
    461461    {
    462         this.controls.panel.appendChild(this.controls.playButton);
    463462        if (!this.isLive)
    464463            this.controls.panel.appendChild(this.controls.rewindButton);
     464        this.controls.panel.appendChild(this.controls.playButton);
    465465        this.controls.panel.appendChild(this.controls.statusDisplay);
    466466        if (!this.isLive) {
    … …  
    834834        if (this.video.muted)
    835835            this.controls.muteButton.setAttribute('aria-label', this.UIString('Unmute'));
    836         this.drawVolumeBackground();
    837836        return true;
    838837    },
    … …  
    15661565            this.controls.volume.value = this.video.volume;
    15671566        }
    1568         this.drawVolumeBackground();
    15691567    },
    15701568
Note: See TracChangeset for help on using the changeset viewer.