Changeset 209506 in webkit


Ignore:
Timestamp:
Dec 7, 2016, 5:37:56 PM (9 years ago)
Author:
commit-queue@webkit.org
Message:

[Modern Media Controls] Remove aspect ratio button
​https://bugs.webkit.org/show_bug.cgi?id=165571

Patch by Antoine Quint <Antoine Quint> on 2016-12-07
Reviewed by Dean Jackson.

Source/WebCore:

Since we do not have a way to toggle letterboxing on an HTMLMediaElement, we remove the
corresponding button in the media controls.

  • Modules/modern-media-controls/controls/aspect-ratio-button.js: Removed.
  • Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js:
  • Modules/modern-media-controls/js-files:

LayoutTests:

We no longer have an AspectRatioButton.

  • media/modern-media-controls/aspect-ratio-button/aspect-ratio-button-expected.txt: Removed.
  • media/modern-media-controls/aspect-ratio-button/aspect-ratio-button.html: Removed.
  • media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt:
  • media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html:
  • media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt:
  • media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html:
  • media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt:
  • media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html:
  • media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin-expected.txt:
  • media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html:
Location:
trunk
Files:
2 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r209504 r209506  
     12016-12-07  Antoine Quint  <graouts@apple.com>
     2
     3        [Modern Media Controls] Remove aspect ratio button
     4        https://bugs.webkit.org/show_bug.cgi?id=165571
     5
     6        Reviewed by Dean Jackson.
     7
     8        We no longer have an AspectRatioButton.
     9
     10        * media/modern-media-controls/aspect-ratio-button/aspect-ratio-button-expected.txt: Removed.
     11        * media/modern-media-controls/aspect-ratio-button/aspect-ratio-button.html: Removed.
     12        * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt:
     13        * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html:
     14        * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt:
     15        * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html:
     16        * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt:
     17        * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html:
     18        * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin-expected.txt:
     19        * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html:
     20
    1212016-12-07  Jeremy Jones  <jeremyj@apple.com>
    222

  • trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles-expected.txt

    r209388 r209506  
    99PASS centerContainerBounds.height is 44
    1010
    11 PASS rightContainerBounds.left is within 0.5 of 468
     11PASS rightContainerBounds.left is within 0.5 of 488
    1212PASS rightContainerBounds.top is 500
    13 PASS rightContainerBounds.width is within 0.5 of 166
     13PASS rightContainerBounds.width is within 0.5 of 146
    1414PASS rightContainerBounds.height is 44
    1515

  • trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-containers-styles.html

    r209388 r209506  
    4242    debug("");
    4343    rightContainerBounds = rightContainer.element.getBoundingClientRect();
    44     shouldBeCloseTo("rightContainerBounds.left", 468, 0.5);
     44    shouldBeCloseTo("rightContainerBounds.left", 488, 0.5);
    4545    shouldBe("rightContainerBounds.top", "500");
    46     shouldBeCloseTo("rightContainerBounds.width", 166, 0.5);
     46    shouldBeCloseTo("rightContainerBounds.width", 146, 0.5);
    4747    shouldBe("rightContainerBounds.height", "44");
    4848

  • trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles-expected.txt

    r208448 r209506  
    2424PASS style.height is "44px"
    2525
    26 AspectRatioButton
    27 PASS style.left is "40px"
    28 PASS style.webkitMaskPositionY is "13px"
    29 PASS style.height is "44px"
    30 
    3126PiPButton
    32 PASS style.left is "72px"
     27PASS style.left is "44px"
    3328PASS style.webkitMaskPositionY is "13px"
    3429PASS style.height is "44px"
    3530
    3631TracksButton
    37 PASS style.left is "111px"
     32PASS style.left is "87px"
    3833PASS style.webkitMaskPositionY is "15px"
    3934PASS style.height is "44px"
    4035
    4136FullscreenButton
    42 PASS style.left is "139px"
     37PASS style.left is "119px"
    4338PASS style.webkitMaskPositionY is "13px"
    4439PASS style.height is "44px"

  • trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html

    r208448 r209506  
    1616    [mediaControls.forwardButton, 127, 16],
    1717    [mediaControls.airplayButton, 12, 13],
    18     [mediaControls.aspectRatioButton, 40, 13],
    19     [mediaControls.pipButton, 72, 13],
    20     [mediaControls.tracksButton, 111, 15],
    21     [mediaControls.fullscreenButton, 139, 13]
     18    [mediaControls.pipButton, 44, 13],
     19    [mediaControls.tracksButton, 87, 15],
     20    [mediaControls.fullscreenButton, 119, 13]
    2221];
    2322

  • trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt

    r208448 r209506  
    2222
    2323Right container
    24 PASS mediaControls.controlsBar.children[2].buttons is [mediaControls.airplayButton, mediaControls.aspectRatioButton, mediaControls.pipButton, mediaControls.tracksButton, mediaControls.fullscreenButton]
     24PASS mediaControls.controlsBar.children[2].buttons is [mediaControls.airplayButton, mediaControls.pipButton, mediaControls.tracksButton, mediaControls.fullscreenButton]
    2525PASS mediaControls.controlsBar.children[2].element.className is "buttons-container right"
    2626PASS mediaControls.controlsBar.children[2].padding is 12

  • trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html

    r208448 r209506  
    2929debug("");
    3030debug("Right container");
    31 shouldBe("mediaControls.controlsBar.children[2].buttons", "[mediaControls.airplayButton, mediaControls.aspectRatioButton, mediaControls.pipButton, mediaControls.tracksButton, mediaControls.fullscreenButton]");
     31shouldBe("mediaControls.controlsBar.children[2].buttons", "[mediaControls.airplayButton, mediaControls.pipButton, mediaControls.tracksButton, mediaControls.fullscreenButton]");
    3232shouldBeEqualToString("mediaControls.controlsBar.children[2].element.className", "buttons-container right");
    3333shouldBe("mediaControls.controlsBar.children[2].padding", "12");

  • trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin-expected.txt

    r208448 r209506  
    33On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
    44
    5 
    6 5 enabled buttons
    7 PASS rightContainer.margin is 12
    85
    964 enabled buttons

  • trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-right-container-margin.html

    r208448 r209506  
    1818
    1919    if (numberOfFrames == 1) {
    20         debug("5 enabled buttons")
    21         shouldBe("rightContainer.margin", "12");
    22         debug("");
    23         mediaControls.airplayButton.enabled = false;
    24     } else if (numberOfFrames == 2) {
    2520        debug("4 enabled buttons")
    2621        shouldBe("rightContainer.margin", "16");
    2722        debug("");
    2823        mediaControls.tracksButton.enabled = false;
    29     } else if (numberOfFrames == 3) {
     24    } else if (numberOfFrames == 2) {
    3025        debug("3 enabled buttons")
    3126        shouldBe("rightContainer.margin", "24");
    3227        mediaControls.pipButton.enabled = false;
    3328        debug("");
    34     } else if (numberOfFrames == 4) {
     29    } else if (numberOfFrames == 3) {
    3530        debug("2 enabled buttons")
    3631        shouldBe("rightContainer.margin", "24");

  • trunk/Source/WebCore/ChangeLog

    r209504 r209506  
     12016-12-07  Antoine Quint  <graouts@apple.com>
     2
     3        [Modern Media Controls] Remove aspect ratio button
     4        https://bugs.webkit.org/show_bug.cgi?id=165571
     5
     6        Reviewed by Dean Jackson.
     7
     8        Since we do not have a way to toggle letterboxing on an HTMLMediaElement, we remove the
     9        corresponding button in the media controls.
     10
     11        * Modules/modern-media-controls/controls/aspect-ratio-button.js: Removed.
     12        * Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js:
     13        * Modules/modern-media-controls/js-files:
     14
    1152016-12-07  Jeremy Jones  <jeremyj@apple.com>
    216

  • trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js

    r209388 r209506  
    4242        // Set up fullscreen-specific buttons.
    4343        this.rewindButton = new RewindButton(this);
    44         this.aspectRatioButton = new AspectRatioButton(this);
    4544        this.forwardButton = new ForwardButton(this);
    4645        this.fullscreenButton.isFullscreen = true;
    … …  
    5655
    5756        this._rightContainer = new ButtonsContainer({
    58             buttons: [this.airplayButton, this.aspectRatioButton, this.pipButton, this.tracksButton, this.fullscreenButton],
     57            buttons: [this.airplayButton, this.pipButton, this.tracksButton, this.fullscreenButton],
    5958            cssClassName: "right",
    6059            padding: 12

  • trunk/Source/WebCore/Modules/modern-media-controls/js-files

    r209451 r209506  
    2121controls/tracks-button.js
    2222controls/fullscreen-button.js
    23 controls/aspect-ratio-button.js
    2423controls/seek-button.js
    2524controls/rewind-button.js
Note: See TracChangeset for help on using the changeset viewer.