Changeset 203057 in webkit


Ignore:
Timestamp:
Jul 11, 2016, 7:37:32 AM (9 years ago)
Author:
eric.carlson@apple.com
Message:

Add a test for media control dropoff
​https://bugs.webkit.org/show_bug.cgi?id=151287
<rdar://problem/23544666>

Reviewed by Antoine Quint.

Source/WebCore:

Test: media/controls/inline-elements-dropoff-order.html

  • Modules/mediacontrols/mediaControlsApple.js: Expose more state to testing.
  • testing/InternalSettings.cpp:

(WebCore::InternalSettings::setAllowsAirPlayForMediaPlayback): Renamed from setWirelessPlaybackDisabled.
(WebCore::InternalSettings::setWirelessPlaybackDisabled): Deleted.

  • testing/InternalSettings.h:
  • testing/InternalSettings.idl:

LayoutTests:

  • media/controls/inline-elements-dropoff-order-expected.txt: Added.
  • media/controls/inline-elements-dropoff-order.html: Added.
  • platform/mac-yosemite/media/controls: Added.
  • platform/mac-yosemite/media/controls/inline-elements-dropoff-order-expected.txt: Added.
  • platform/mac-elcapitan/media/controls: Added.
  • platform/mac-elcapitan/media/controls/inline-elements-dropoff-order-expected.txt: Added.
Location:
trunk
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r203055 r203057  
     12016-07-11  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Add a test for media control dropoff
     4        https://bugs.webkit.org/show_bug.cgi?id=151287
     5        <rdar://problem/23544666>
     6
     7        Reviewed by Antoine Quint.
     8
     9        * media/controls/inline-elements-dropoff-order-expected.txt: Added.
     10        * media/controls/inline-elements-dropoff-order.html: Added.
     11        * platform/mac-yosemite/media/controls: Added.
     12        * platform/mac-yosemite/media/controls/inline-elements-dropoff-order-expected.txt: Added.
     13        * platform/mac-elcapitan/media/controls: Added.
     14        * platform/mac-elcapitan/media/controls/inline-elements-dropoff-order-expected.txt: Added.
     15
    1162016-07-11  Frederic Wang  <fwang@igalia.com>
    217

  • trunk/Source/WebCore/ChangeLog

    r203056 r203057  
     12016-07-11  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Add a test for media control dropoff
     4        https://bugs.webkit.org/show_bug.cgi?id=151287
     5        <rdar://problem/23544666>
     6
     7        Reviewed by Antoine Quint.
     8
     9        Test: media/controls/inline-elements-dropoff-order.html
     10
     11        * Modules/mediacontrols/mediaControlsApple.js: Expose more state to testing.
     12        * testing/InternalSettings.cpp:
     13        (WebCore::InternalSettings::setAllowsAirPlayForMediaPlayback): Renamed from setWirelessPlaybackDisabled.
     14        (WebCore::InternalSettings::setWirelessPlaybackDisabled): Deleted.
     15        * testing/InternalSettings.h:
     16        * testing/InternalSettings.idl:
     17
     18
    1192016-07-11  Philippe Normand  <pnormand@igalia.com>
    220

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

    r202929 r203057  
    22892289                name: "Show Controls",
    22902290                object: this.showControlsButton,
    2291                 extraProperties: ["hidden"]
     2291                extraProperties: ["hidden"],
    22922292            },
    22932293            {
    … …  
    22952295                object: this.controls.statusDisplay,
    22962296                styleValues: ["display"],
    2297                 extraProperties: ["textContent"]
     2297                extraProperties: ["textContent"],
    22982298            },
    22992299            {
    23002300                name: "Play Button",
    2301                 object: this.controls.playButton
     2301                object: this.controls.playButton,
     2302                extraProperties: ["hidden"],
    23022303            },
    23032304            {
    23042305                name: "Rewind Button",
    2305                 object: this.controls.rewindButton
     2306                object: this.controls.rewindButton,
     2307                extraProperties: ["hidden"],
    23062308            },
    23072309            {
    23082310                name: "Timeline Box",
    2309                 object: this.controls.timelineBox
     2311                object: this.controls.timelineBox,
    23102312            },
    23112313            {
    23122314                name: "Mute Box",
    2313                 object: this.controls.muteBox
     2315                object: this.controls.muteBox,
     2316                extraProperties: ["hidden"],
    23142317            },
    23152318            {
    23162319                name: "Fullscreen Button",
    2317                 object: this.controls.fullscreenButton
     2320                object: this.controls.fullscreenButton,
     2321                extraProperties: ["hidden"],
    23182322            },
    23192323            {
    … …  
    23262330                name: "Picture-in-picture Button",
    23272331                object: this.controls.pictureInPictureButton,
    2328                 extraProperties: ["parentElement"],
     2332                extraProperties: ["parentElement", "hidden"],
     2333            },
     2334            {
     2335                name: "Caption Button",
     2336                object: this.controls.captionButton,
     2337                extraProperties: ["hidden"],
     2338            },
     2339            {
     2340                name: "Timeline",
     2341                object: this.controls.timeline,
     2342                extraProperties: ["hidden"],
     2343            },
     2344            {
     2345                name: "Current Time",
     2346                object: this.controls.currentTime,
     2347                extraProperties: ["hidden"],
     2348            },
     2349            {
     2350                name: "Thumbnail Track",
     2351                object: this.controls.thumbnailTrack,
     2352                extraProperties: ["hidden"],
     2353            },
     2354            {
     2355                name: "Time Remaining",
     2356                object: this.controls.remainingTime,
     2357                extraProperties: ["hidden"],
    23292358            },
    23302359            {
    23312360                name: "Track Menu",
    2332                 object: this.captionMenu
     2361                object: this.captionMenu,
    23332362            },
    23342363            {

  • trunk/Source/WebCore/testing/InternalSettings.cpp

    r202018 r203057  
    228228{
    229229#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    230     page->settings().setAllowsAirPlayForMediaPlayback(false);
     230    setAllowsAirPlayForMediaPlayback(false);
    231231#endif
    232232}
    … …  
    239239    page()->settings().setForcePendingWebGLPolicy(false);
    240240#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    241     page()->settings().setAllowsAirPlayForMediaPlayback(false);
     241    setAllowsAirPlayForMediaPlayback(false);
    242242#endif
    243243
    … …  
    382382}
    383383
    384 void InternalSettings::setWirelessPlaybackDisabled(bool available)
     384void InternalSettings::setAllowsAirPlayForMediaPlayback(bool allows)
    385385{
    386386#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    387     m_page->settings().setAllowsAirPlayForMediaPlayback(available);
    388 #else
    389     UNUSED_PARAM(available);
     387    m_page->settings().setAllowsAirPlayForMediaPlayback(allows);
     388#else
     389    UNUSED_PARAM(allows);
    390390#endif
    391391}

  • trunk/Source/WebCore/testing/InternalSettings.h

    r201956 r203057  
    139139    void setMediaTypeOverride(const String& mediaType, ExceptionCode&);
    140140    void setCanStartMedia(bool, ExceptionCode&);
    141     void setWirelessPlaybackDisabled(bool);
     141    void setAllowsAirPlayForMediaPlayback(bool);
    142142    void setEditingBehavior(const String&, ExceptionCode&);
    143143    void setPreferMIMETypeForImages(bool, ExceptionCode&);

  • trunk/Source/WebCore/testing/InternalSettings.idl

    r201956 r203057  
    5454    [RaisesException] void setTimeWithoutMouseMovementBeforeHidingControls(unrestricted double time);
    5555    [RaisesException] void setMediaTypeOverride(DOMString mediaTypeOverride);
    56     void setWirelessPlaybackDisabled(boolean available);
     56    void setAllowsAirPlayForMediaPlayback(boolean available);
    5757
    5858    [RaisesException] void setForcePendingWebGLPolicy(boolean forced);
Note: See TracChangeset for help on using the changeset viewer.