Changeset 207373 in webkit


Ignore:
Timestamp:
Oct 15, 2016 2:15:41 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

[Modern Media Controls] macOS inline controls
​https://bugs.webkit.org/show_bug.cgi?id=163444
<rdar://problem/27989473>

Patch by Antoine Quint <Antoine Quint> on 2016-10-15
Reviewed by Dean Jackson.

Source/WebCore:

Introducing the new MacOSMediaControls and MacOSInlineMediaControls classes. MacOSMediaControls is a MediaControls subclass
that adds specific buttons to the macOS platform and sets the layout traits to be macOS. This class has a new subclass,
MacOSInlineMediaControls, which sets the layout traits to also include inline and implements custom layout to drop
controls as necessary as the width of the controls varies. It also shows the volume slider when the mute button is hovered.

Tests: media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-buttons-styles.html

media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-constructor.html
media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-controls-bar-styles.html
media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-layout.html
media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-time-control-styles.html
media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-slider-visibility.html
media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-styles.html
media/modern-media-controls/macos-inline-media-controls/macos-inline-media-dropping-controls.html
media/modern-media-controls/macos-media-controls/macos-media-controls.html

  • Modules/modern-media-controls/controls/macos-inline-media-controls.css: Added.

(.media-controls.mac.inline > .controls-bar):
(.media-controls.mac.inline > .controls-bar > *):
(.media-controls.mac.inline button):
(.media-controls.mac.inline button:active):
(.media-controls.mac.inline > .controls-bar button):
(.media-controls.mac.inline > .controls-bar,):
(.media-controls.mac.inline button.play-pause):
(.media-controls.mac.inline button.skip-back):
(.media-controls.mac.inline .scrubber.slider):
(.media-controls.mac.inline button.mute):
(.media-controls.mac.inline button.airplay):
(.media-controls.mac.inline button.pip):
(.media-controls.mac.inline button.tracks):
(.media-controls.mac.inline button.fullscreen):
(.media-controls.mac.inline .time-label):
(.media-controls.mac.inline .volume-slider-container):
(.media-controls.mac.inline .volume-slider-container:before):
(.media-controls.mac.inline .volume.slider):

  • Modules/modern-media-controls/controls/macos-inline-media-controls.js: Added.

(MacOSInlineMediaControls.prototype.layout):
(MacOSInlineMediaControls.prototype.handleEvent):

  • Modules/modern-media-controls/controls/macos-media-controls.js: Added.

(MacOSMediaControls):

LayoutTests:

Testing the properties of the new MacOSMediaControls and MacOSInlineMediaControls classes.

  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-buttons-styles-expected.txt: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-buttons-styles.html: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-constructor-expected.txt: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-constructor.html: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-controls-bar-styles-expected.txt: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-controls-bar-styles.html: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-layout-expected.txt: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-layout.html: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-time-control-styles-expected.txt: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-time-control-styles.html: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-slider-visibility-expected.txt: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-slider-visibility.html: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-styles-expected.txt: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-styles.html: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-dropping-controls-expected.txt: Added.
  • media/modern-media-controls/macos-inline-media-controls/macos-inline-media-dropping-controls.html: Added.
  • media/modern-media-controls/macos-media-controls/macos-media-controls-expected.txt: Added.
  • media/modern-media-controls/macos-media-controls/macos-media-controls.html: Added.
Location:
trunk
Files:
23 added
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r207372 r207373  
     12016-10-15  Antoine Quint  <graouts@apple.com>
     2
     3        [Modern Media Controls] macOS inline controls
     4        https://bugs.webkit.org/show_bug.cgi?id=163444
     5        <rdar://problem/27989473>
     6
     7        Reviewed by Dean Jackson.
     8
     9        Testing the properties of the new MacOSMediaControls and MacOSInlineMediaControls classes.
     10
     11        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-buttons-styles-expected.txt: Added.
     12        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-buttons-styles.html: Added.
     13        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-constructor-expected.txt: Added.
     14        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-constructor.html: Added.
     15        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-controls-bar-styles-expected.txt: Added.
     16        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-controls-bar-styles.html: Added.
     17        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-layout-expected.txt: Added.
     18        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-layout.html: Added.
     19        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-time-control-styles-expected.txt: Added.
     20        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-time-control-styles.html: Added.
     21        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-slider-visibility-expected.txt: Added.
     22        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-slider-visibility.html: Added.
     23        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-styles-expected.txt: Added.
     24        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-styles.html: Added.
     25        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-dropping-controls-expected.txt: Added.
     26        * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-dropping-controls.html: Added.
     27        * media/modern-media-controls/macos-media-controls/macos-media-controls-expected.txt: Added.
     28        * media/modern-media-controls/macos-media-controls/macos-media-controls.html: Added.
     29
    1302016-10-14  Antti Koivisto  <antti@apple.com>
    231

  • trunk/Source/WebCore/ChangeLog

    r207372 r207373  
     12016-10-15  Antoine Quint  <graouts@apple.com>
     2
     3        [Modern Media Controls] macOS inline controls
     4        https://bugs.webkit.org/show_bug.cgi?id=163444
     5        <rdar://problem/27989473>
     6
     7        Reviewed by Dean Jackson.
     8
     9        Introducing the new MacOSMediaControls and MacOSInlineMediaControls classes. MacOSMediaControls is a MediaControls subclass
     10        that adds specific buttons to the macOS platform and sets the layout traits to be macOS. This class has a new subclass,
     11        MacOSInlineMediaControls, which sets the layout traits to also include inline and implements custom layout to drop
     12        controls as necessary as the width of the controls varies. It also shows the volume slider when the mute button is hovered.
     13       
     14        Tests: media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-buttons-styles.html
     15               media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-constructor.html
     16               media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-controls-bar-styles.html
     17               media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-layout.html
     18               media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-time-control-styles.html
     19               media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-slider-visibility.html
     20               media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-volume-styles.html
     21               media/modern-media-controls/macos-inline-media-controls/macos-inline-media-dropping-controls.html
     22               media/modern-media-controls/macos-media-controls/macos-media-controls.html
     23
     24        * Modules/modern-media-controls/controls/macos-inline-media-controls.css: Added.
     25        (.media-controls.mac.inline > .controls-bar):
     26        (.media-controls.mac.inline > .controls-bar > *):
     27        (.media-controls.mac.inline button):
     28        (.media-controls.mac.inline button:active):
     29        (.media-controls.mac.inline > .controls-bar button):
     30        (.media-controls.mac.inline > .controls-bar,):
     31        (.media-controls.mac.inline button.play-pause):
     32        (.media-controls.mac.inline button.skip-back):
     33        (.media-controls.mac.inline .scrubber.slider):
     34        (.media-controls.mac.inline button.mute):
     35        (.media-controls.mac.inline button.airplay):
     36        (.media-controls.mac.inline button.pip):
     37        (.media-controls.mac.inline button.tracks):
     38        (.media-controls.mac.inline button.fullscreen):
     39        (.media-controls.mac.inline .time-label):
     40        (.media-controls.mac.inline .volume-slider-container):
     41        (.media-controls.mac.inline .volume-slider-container:before):
     42        (.media-controls.mac.inline .volume.slider):
     43        * Modules/modern-media-controls/controls/macos-inline-media-controls.js: Added.
     44        (MacOSInlineMediaControls.prototype.layout):
     45        (MacOSInlineMediaControls.prototype.handleEvent):
     46        * Modules/modern-media-controls/controls/macos-media-controls.js: Added.
     47        (MacOSMediaControls):
     48
    1492016-10-14  Antti Koivisto  <antti@apple.com>
    250
Note: See TracChangeset for help on using the changeset viewer.