Changeset 156135 in webkit


Ignore:
Timestamp:
Sep 19, 2013 6:51:01 PM (11 years ago)
Author:
eric.carlson@apple.com
Message:

MediaStream API: update MediaStreamTrackEvent object to match spec
​https://bugs.webkit.org/show_bug.cgi?id=121624

Reviewed by Dean Jackson.

Source/WebCore:

Test: fast/mediastream/MediaStreamTrackEvent-constructor.html

  • Modules/mediastream/MediaStreamTrack.idl: Remove NoInterfaceObject.
  • Modules/mediastream/MediaStreamTrackEvent.cpp:

(WebCore::MediaStreamTrackEventInit::MediaStreamTrackEventInit): New.
(WebCore::MediaStreamTrackEvent::create): New form that takes an initialize.
(WebCore::MediaStreamTrackEvent::MediaStreamTrackEvent): Ditto.

  • Modules/mediastream/MediaStreamTrackEvent.h:
  • Modules/mediastream/MediaStreamTrackEvent.idl:
  • bindings/js/JSDictionary.cpp:

(WebCore::JSDictionary::convertValue): New.

  • bindings/js/JSDictionary.h:

LayoutTests:

  • fast/mediastream/MediaStreamTrackEvent-constructor-expected.txt: Added.
  • fast/mediastream/MediaStreamTrackEvent-constructor.html: Added.
Location:
trunk
Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r156130 r156135  
     12013-09-19  Eric Carlson  <eric.carlson@apple.com>
     2
     3        MediaStream API: update MediaStreamTrackEvent object to match spec
     4        https://bugs.webkit.org/show_bug.cgi?id=121624
     5
     6        Reviewed by Dean Jackson.
     7
     8        * fast/mediastream/MediaStreamTrackEvent-constructor-expected.txt: Added.
     9        * fast/mediastream/MediaStreamTrackEvent-constructor.html: Added.
     10
    1112013-09-19  Alexey Proskuryakov  <ap@apple.com>
    212

  • trunk/Source/WebCore/ChangeLog

    r156133 r156135  
     12013-09-19  Eric Carlson  <eric.carlson@apple.com>
     2
     3        MediaStream API: update MediaStreamTrackEvent object to match spec
     4        https://bugs.webkit.org/show_bug.cgi?id=121624
     5
     6        Reviewed by Dean Jackson.
     7
     8        Test: fast/mediastream/MediaStreamTrackEvent-constructor.html
     9
     10        * Modules/mediastream/MediaStreamTrack.idl: Remove NoInterfaceObject.
     11
     12        * Modules/mediastream/MediaStreamTrackEvent.cpp:
     13        (WebCore::MediaStreamTrackEventInit::MediaStreamTrackEventInit): New.
     14        (WebCore::MediaStreamTrackEvent::create): New form that takes an initialize.
     15        (WebCore::MediaStreamTrackEvent::MediaStreamTrackEvent): Ditto.
     16        * Modules/mediastream/MediaStreamTrackEvent.h:
     17        * Modules/mediastream/MediaStreamTrackEvent.idl:
     18
     19        * bindings/js/JSDictionary.cpp:
     20        (WebCore::JSDictionary::convertValue): New.
     21        * bindings/js/JSDictionary.h:
     22
    1232013-09-19  Anders Carlsson  <andersca@apple.com>
    224

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl

    r155992 r156135  
    2424
    2525[
    26     NoInterfaceObject,
    2726    Conditional=MEDIA_STREAM,
    2827    EventTarget,

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.cpp

    r121691 r156135  
    3333namespace WebCore {
    3434
     35MediaStreamTrackEventInit::MediaStreamTrackEventInit()
     36    : track(0)
     37{
     38}
     39
    3540PassRefPtr<MediaStreamTrackEvent> MediaStreamTrackEvent::create()
    3641{
    … …  
    4348}
    4449
     50PassRefPtr<MediaStreamTrackEvent> MediaStreamTrackEvent::create(const AtomicString& type, const MediaStreamTrackEventInit& initializer)
     51{
     52    return adoptRef(new MediaStreamTrackEvent(type, initializer));
     53}
    4554
    4655MediaStreamTrackEvent::MediaStreamTrackEvent()
    … …  
    5160    : Event(type, canBubble, cancelable)
    5261    , m_track(track)
     62{
     63}
     64
     65MediaStreamTrackEvent::MediaStreamTrackEvent(const AtomicString& type, const MediaStreamTrackEventInit& initializer)
     66    : Event(type, initializer)
     67    , m_track(initializer.track)
    5368{
    5469}

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.h

    r121691 r156135  
    3535class MediaStreamTrack;
    3636
     37struct MediaStreamTrackEventInit : public EventInit {
     38    MediaStreamTrackEventInit();
     39   
     40    RefPtr<MediaStreamTrack> track;
     41};
     42
    3743class MediaStreamTrackEvent : public Event {
    3844public:
    … …  
    4147    static PassRefPtr<MediaStreamTrackEvent> create();
    4248    static PassRefPtr<MediaStreamTrackEvent> create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStreamTrack>);
     49    static PassRefPtr<MediaStreamTrackEvent> create(const AtomicString& type, const MediaStreamTrackEventInit& initializer);
    4350
    4451    MediaStreamTrack* track() const;
    … …  
    5057    MediaStreamTrackEvent();
    5158    MediaStreamTrackEvent(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtr<MediaStreamTrack>);
     59    MediaStreamTrackEvent(const AtomicString& type, const MediaStreamTrackEventInit&);
    5260
    5361    RefPtr<MediaStreamTrack> m_track;

  • trunk/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.idl

    r149796 r156135  
    2424
    2525[
    26     NoInterfaceObject,
    2726    Conditional=MEDIA_STREAM,
     27    ConstructorTemplate=Event
    2828] interface MediaStreamTrackEvent : Event {
    29    readonly attribute MediaStreamTrack track;
     29   [InitializedByEventConstructor] readonly attribute MediaStreamTrack track;
    3030};
    3131

  • trunk/Source/WebCore/bindings/js/JSDictionary.cpp

    r154127 r156135  
    5151#if ENABLE(MEDIA_STREAM)
    5252#include "JSMediaStream.h"
     53#include "JSMediaStreamTrack.h"
    5354#endif
    5455
    … …  
    232233    result = toMediaStream(value);
    233234}
     235
     236void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, RefPtr<MediaStreamTrack>& result)
     237{
     238    result = toMediaStreamTrack(value);
     239}
    234240#endif
    235241

  • trunk/Source/WebCore/bindings/js/JSDictionary.h

    r154127 r156135  
    4545class MediaKeyError;
    4646class MediaStream;
     47class MediaStreamTrack;
    4748class Node;
    4849class ScriptValue;
    … …  
    127128#if ENABLE(MEDIA_STREAM)
    128129    static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<MediaStream>& result);
     130    static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<MediaStreamTrack>& result);
    129131#endif
    130132#if ENABLE(FONT_LOAD_EVENTS)
Note: See TracChangeset for help on using the changeset viewer.