Changeset 123533 in webkit


Ignore:
Timestamp:
Jul 24, 2012 3:07:17 PM (12 years ago)
Author:
zmo@google.com
Message:

Unreviewed, rolling out r123499.
​http://trac.webkit.org/changeset/123499
​https://bugs.webkit.org/show_bug.cgi?id=92161

Android fails to compile (Requested by zhenyao on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-07-24

Source/Platform:

  • chromium/public/WebMediaStreamDescriptor.h:

(WebMediaStreamDescriptor):

  • chromium/public/WebMediaStreamSource.h:

(WebMediaStreamSource):

Source/WebCore:

  • GNUmakefile.list.am:
  • Modules/mediastream/MediaStream.cpp:

(WebCore::MediaStream::MediaStream):
(WebCore::MediaStream::addTrack):

  • Modules/mediastream/MediaStreamTrack.cpp:

(WebCore::MediaStreamTrack::create):
(WebCore::MediaStreamTrack::MediaStreamTrack):
(WebCore::MediaStreamTrack::~MediaStreamTrack):
(WebCore::MediaStreamTrack::setEnabled):

  • Modules/mediastream/MediaStreamTrack.h:

(MediaStreamTrack):

  • Modules/mediastream/MediaStreamTrack.idl:
  • WebCore.gypi:
  • dom/EventNames.h:

(WebCore):

  • dom/EventTargetFactory.in:
  • platform/chromium/support/WebMediaStreamDescriptor.cpp:

(WebKit):
(WebKit::WebMediaStreamDescriptor::sources):

  • platform/chromium/support/WebMediaStreamSource.cpp:
  • platform/mediastream/MediaStreamSource.cpp: Removed.
  • platform/mediastream/MediaStreamSource.h:

(WebCore::MediaStreamSource::create):
(WebCore::MediaStreamSource::muted):
(WebCore::MediaStreamSource::setMuted):
(WebCore::MediaStreamSource::MediaStreamSource):
(MediaStreamSource):

  • platform/mediastream/chromium/MediaStreamCenterChromium.cpp:

(WebCore::MediaStreamCenterChromium::queryMediaStreamSources):
(WebCore::MediaStreamCenterChromium::didCreateMediaStream):

Source/WebKit/chromium:

  • src/AssertMatchingEnums.cpp:

Tools:

  • DumpRenderTree/DumpRenderTree.gypi:
  • DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp:

(MockWebKitPlatformSupport::createMediaStreamCenter):

  • DumpRenderTree/chromium/MockWebKitPlatformSupport.h:

(MockWebKitPlatformSupport):

  • DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp: Removed.
  • DumpRenderTree/chromium/MockWebMediaStreamCenter.h: Removed.

LayoutTests:

  • fast/mediastream/MediaStreamTrack-expected.txt: Removed.
  • fast/mediastream/MediaStreamTrack.html: Removed.
Location:
trunk
Files:
5 deleted
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r123532 r123533  
     12012-07-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r123499.
     4        http://trac.webkit.org/changeset/123499
     5        https://bugs.webkit.org/show_bug.cgi?id=92161
     6
     7        Android fails to compile (Requested by zhenyao on #webkit).
     8
     9        * fast/mediastream/MediaStreamTrack-expected.txt: Removed.
     10        * fast/mediastream/MediaStreamTrack.html: Removed.
     11
    1122012-07-24  Andrew Wilson  <atwilson@chromium.org>
    213

  • trunk/Source/Platform/ChangeLog

    r123511 r123533  
     12012-07-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r123499.
     4        http://trac.webkit.org/changeset/123499
     5        https://bugs.webkit.org/show_bug.cgi?id=92161
     6
     7        Android fails to compile (Requested by zhenyao on #webkit).
     8
     9        * chromium/public/WebMediaStreamDescriptor.h:
     10        (WebMediaStreamDescriptor):
     11        * chromium/public/WebMediaStreamSource.h:
     12        (WebMediaStreamSource):
     13
    1142012-07-24  Leandro Gracia Gil  <leandrogracia@chromium.org>
    215

  • trunk/Source/Platform/chromium/public/WebMediaStreamDescriptor.h

    r123499 r123533  
    6969    WEBKIT_EXPORT WebString label() const;
    7070
     71    // DEPRECATED
     72    WEBKIT_EXPORT void sources(WebVector<WebMediaStreamSource>&) const;
     73
    7174    WEBKIT_EXPORT void audioSources(WebVector<WebMediaStreamComponent>&) const;
    7275    WEBKIT_EXPORT void videoSources(WebVector<WebMediaStreamComponent>&) const;

  • trunk/Source/Platform/chromium/public/WebMediaStreamSource.h

    r123499 r123533  
    5151    };
    5252
    53     enum ReadyState {
    54         ReadyStateLive = 0,
    55         ReadyStateMuted = 1,
    56         ReadyStateEnded = 2
    57     };
    58 
    5953    WebMediaStreamSource() { }
    6054    WebMediaStreamSource(const WebMediaStreamSource& other) { assign(other); }
    … …  
    7771    WEBKIT_EXPORT WebString name() const;
    7872
    79     WEBKIT_EXPORT void setReadyState(ReadyState);
    80     WEBKIT_EXPORT ReadyState readyState() const;
    81 
    8273#if WEBKIT_IMPLEMENTATION
    8374    WebMediaStreamSource(const WTF::PassRefPtr<WebCore::MediaStreamSource>&);

  • trunk/Source/WebCore/ChangeLog

    r123525 r123533  
     12012-07-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r123499.
     4        http://trac.webkit.org/changeset/123499
     5        https://bugs.webkit.org/show_bug.cgi?id=92161
     6
     7        Android fails to compile (Requested by zhenyao on #webkit).
     8
     9        * GNUmakefile.list.am:
     10        * Modules/mediastream/MediaStream.cpp:
     11        (WebCore::MediaStream::MediaStream):
     12        (WebCore::MediaStream::addTrack):
     13        * Modules/mediastream/MediaStreamTrack.cpp:
     14        (WebCore::MediaStreamTrack::create):
     15        (WebCore::MediaStreamTrack::MediaStreamTrack):
     16        (WebCore::MediaStreamTrack::~MediaStreamTrack):
     17        (WebCore::MediaStreamTrack::setEnabled):
     18        * Modules/mediastream/MediaStreamTrack.h:
     19        (MediaStreamTrack):
     20        * Modules/mediastream/MediaStreamTrack.idl:
     21        * WebCore.gypi:
     22        * dom/EventNames.h:
     23        (WebCore):
     24        * dom/EventTargetFactory.in:
     25        * platform/chromium/support/WebMediaStreamDescriptor.cpp:
     26        (WebKit):
     27        (WebKit::WebMediaStreamDescriptor::sources):
     28        * platform/chromium/support/WebMediaStreamSource.cpp:
     29        * platform/mediastream/MediaStreamSource.cpp: Removed.
     30        * platform/mediastream/MediaStreamSource.h:
     31        (WebCore::MediaStreamSource::create):
     32        (WebCore::MediaStreamSource::muted):
     33        (WebCore::MediaStreamSource::setMuted):
     34        (WebCore::MediaStreamSource::MediaStreamSource):
     35        (MediaStreamSource):
     36        * platform/mediastream/chromium/MediaStreamCenterChromium.cpp:
     37        (WebCore::MediaStreamCenterChromium::queryMediaStreamSources):
     38        (WebCore::MediaStreamCenterChromium::didCreateMediaStream):
     39
    1402012-07-24  Julien Chaffraix  <jchaffraix@webkit.org>
    241

  • trunk/Source/WebCore/GNUmakefile.list.am

    r123522 r123533  
    35463546        Source/WebCore/platform/mediastream/MediaStreamComponent.h \
    35473547        Source/WebCore/platform/mediastream/MediaStreamDescriptor.h \
    3548         Source/WebCore/platform/mediastream/MediaStreamSource.cpp \
    35493548        Source/WebCore/platform/mediastream/MediaStreamSource.h \
    35503549        Source/WebCore/platform/mediastream/MediaStreamSourcesQueryClient.h \

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

    r123499 r123533  
    9595    audioTrackVector.reserveCapacity(numberOfAudioTracks);
    9696    for (size_t i = 0; i < numberOfAudioTracks; i++)
    97         audioTrackVector.append(MediaStreamTrack::create(context, m_descriptor, m_descriptor->audioComponent(i)));
     97        audioTrackVector.append(MediaStreamTrack::create(m_descriptor, m_descriptor->audioComponent(i)));
    9898    m_audioTracks = MediaStreamTrackList::create(this, audioTrackVector);
    9999
    … …  
    102102    videoTrackVector.reserveCapacity(numberOfVideoTracks);
    103103    for (size_t i = 0; i < numberOfVideoTracks; i++)
    104         videoTrackVector.append(MediaStreamTrack::create(context, m_descriptor, m_descriptor->videoComponent(i)));
     104        videoTrackVector.append(MediaStreamTrack::create(m_descriptor, m_descriptor->videoComponent(i)));
    105105    m_videoTracks = MediaStreamTrackList::create(this, videoTrackVector);
    106106}
    … …  
    152152void MediaStream::addTrack(MediaStreamComponent* component)
    153153{
    154     RefPtr<MediaStreamTrack> track = MediaStreamTrack::create(scriptExecutionContext(), m_descriptor, component);
     154    RefPtr<MediaStreamTrack> track = MediaStreamTrack::create(m_descriptor, component);
    155155    ExceptionCode ec = 0;
    156156    switch (component->source()->type()) {

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

    r123499 r123533  
    2929#if ENABLE(MEDIA_STREAM)
    3030
    31 #include "Event.h"
    3231#include "MediaStreamCenter.h"
    3332#include "MediaStreamComponent.h"
    … …  
    3534namespace WebCore {
    3635
    37 PassRefPtr<MediaStreamTrack> MediaStreamTrack::create(ScriptExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor, MediaStreamComponent* component)
     36PassRefPtr<MediaStreamTrack> MediaStreamTrack::create(PassRefPtr<MediaStreamDescriptor> streamDescriptor, MediaStreamComponent* component)
    3837{
    39     RefPtr<MediaStreamTrack> track = adoptRef(new MediaStreamTrack(context, streamDescriptor, component));
    40     track->suspendIfNeeded();
    41     return track.release();
     38    return adoptRef(new MediaStreamTrack(streamDescriptor, component));
    4239}
    4340
    44 MediaStreamTrack::MediaStreamTrack(ScriptExecutionContext* context, PassRefPtr<MediaStreamDescriptor> streamDescriptor, MediaStreamComponent* component)
    45     : ActiveDOMObject(context, this)
    46     , m_stopped(false)
    47     , m_streamDescriptor(streamDescriptor)
     41MediaStreamTrack::MediaStreamTrack(PassRefPtr<MediaStreamDescriptor> streamDescriptor, MediaStreamComponent* component)
     42    : m_streamDescriptor(streamDescriptor)
    4843    , m_component(component)
    4944{
    50     m_component->source()->addObserver(this);
    5145}
    5246
    5347MediaStreamTrack::~MediaStreamTrack()
    5448{
    55     m_component->source()->removeObserver(this);
    5649}
    5750
    … …  
    8477void MediaStreamTrack::setEnabled(bool enabled)
    8578{
    86     if (m_stopped || enabled == m_component->enabled())
     79    if (enabled == m_component->enabled())
    8780        return;
    8881
    … …  
    9588}
    9689
    97 MediaStreamTrack::ReadyState MediaStreamTrack::readyState() const
    98 {
    99     if (m_stopped)
    100         return ENDED;
    101 
    102     switch (m_component->source()->readyState()) {
    103     case MediaStreamSource::ReadyStateLive:
    104         return LIVE;
    105     case MediaStreamSource::ReadyStateMuted:
    106         return MUTED;
    107     case MediaStreamSource::ReadyStateEnded:
    108         return ENDED;
    109     }
    110 
    111     ASSERT_NOT_REACHED();
    112     return ENDED;
    113 }
    114 
    115 void MediaStreamTrack::sourceChangedState()
    116 {
    117     if (m_stopped)
    118         return;
    119 
    120     switch (m_component->source()->readyState()) {
    121     case MediaStreamSource::ReadyStateLive:
    122         dispatchEvent(Event::create(eventNames().unmuteEvent, false, false));
    123         break;
    124     case MediaStreamSource::ReadyStateMuted:
    125         dispatchEvent(Event::create(eventNames().muteEvent, false, false));
    126         break;
    127     case MediaStreamSource::ReadyStateEnded:
    128         dispatchEvent(Event::create(eventNames().endedEvent, false, false));
    129         break;
    130     }
    131 }
    132 
    13390MediaStreamComponent* MediaStreamTrack::component()
    13491{
    … …  
    13693}
    13794
    138 void MediaStreamTrack::stop()
    139 {
    140     m_stopped = true;
    141 }
    142 
    143 const AtomicString& MediaStreamTrack::interfaceName() const
    144 {
    145     return eventNames().interfaceForMediaStreamTrack;
    146 }
    147 
    148 ScriptExecutionContext* MediaStreamTrack::scriptExecutionContext() const
    149 {
    150     return ActiveDOMObject::scriptExecutionContext();
    151 }
    152 
    153 EventTargetData* MediaStreamTrack::eventTargetData()
    154 {
    155     return &m_eventTargetData;
    156 }
    157 
    158 EventTargetData* MediaStreamTrack::ensureEventTargetData()
    159 {
    160     return &m_eventTargetData;
    161 }
    162 
    16395} // namespace WebCore
    16496

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

    r123499 r123533  
    2929#if ENABLE(MEDIA_STREAM)
    3030
    31 #include "ActiveDOMObject.h"
    32 #include "EventTarget.h"
    3331#include "MediaStreamDescriptor.h"
    34 #include "MediaStreamSource.h"
    3532#include "PlatformString.h"
    3633#include <wtf/RefCounted.h>
    … …  
    4239class MediaStreamComponent;
    4340
    44 class MediaStreamTrack : public RefCounted<MediaStreamTrack>, public ActiveDOMObject, public EventTarget, public MediaStreamSource::Observer {
     41class MediaStreamTrack : public RefCounted<MediaStreamTrack> {
    4542public:
    46     enum ReadyState {
    47         LIVE = 0,
    48         MUTED = 1,
    49         ENDED = 2
    50     };
    51 
    52     static PassRefPtr<MediaStreamTrack> create(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>, MediaStreamComponent*);
     43    static PassRefPtr<MediaStreamTrack> create(PassRefPtr<MediaStreamDescriptor>, MediaStreamComponent*);
    5344    virtual ~MediaStreamTrack();
    5445
    … …  
    5950    void setEnabled(bool);
    6051
    61     ReadyState readyState() const;
    62 
    63     DEFINE_ATTRIBUTE_EVENT_LISTENER(mute);
    64     DEFINE_ATTRIBUTE_EVENT_LISTENER(unmute);
    65     DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
    66 
    6752    MediaStreamComponent* component();
    6853
    69     // EventTarget
    70     virtual const AtomicString& interfaceName() const OVERRIDE;
    71     virtual ScriptExecutionContext* scriptExecutionContext() const OVERRIDE;
     54private:
     55    MediaStreamTrack(PassRefPtr<MediaStreamDescriptor>, MediaStreamComponent*);
    7256
    73     // ActiveDOMObject
    74     virtual void stop() OVERRIDE;
    75 
    76     using RefCounted<MediaStreamTrack>::ref;
    77     using RefCounted<MediaStreamTrack>::deref;
    78 
    79 private:
    80     MediaStreamTrack(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>, MediaStreamComponent*);
    81 
    82     // EventTarget
    83     virtual EventTargetData* eventTargetData() OVERRIDE;
    84     virtual EventTargetData* ensureEventTargetData() OVERRIDE;
    85     virtual void refEventTarget() OVERRIDE { ref(); }
    86     virtual void derefEventTarget() OVERRIDE { deref(); }
    87     EventTargetData m_eventTargetData;
    88 
    89     // MediaStreamSourceObserver
    90     virtual void sourceChangedState() OVERRIDE;
    91 
    92     bool m_stopped;
    9357    RefPtr<MediaStreamDescriptor> m_streamDescriptor;
    9458    RefPtr<MediaStreamComponent> m_component;

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

    r123499 r123533  
    2727    interface [
    2828        Conditional=MEDIA_STREAM,
    29         EventTarget
    3029    ] MediaStreamTrack {
    3130        readonly attribute DOMString kind;
    3231        readonly attribute DOMString label;
    3332                 attribute boolean enabled;
    34 
    35         const unsigned short LIVE = 0;
    36         const unsigned short MUTED = 1;
    37         const unsigned short ENDED = 2;
    38         readonly attribute unsigned short readyState;
    39 
    40         attribute EventListener onmute;
    41         attribute EventListener onunmute;
    42         attribute EventListener onended;
    43 
    44         // EventTarget interface
    45         void addEventListener(in DOMString type,
    46                               in EventListener listener,
    47                               in [Optional] boolean useCapture);
    48         void removeEventListener(in DOMString type,
    49                                  in EventListener listener,
    50                                  in [Optional] boolean useCapture);
    51         boolean dispatchEvent(in Event event)
    52             raises(EventException);
    5333    };
    5434

  • trunk/Source/WebCore/WebCore.gypi

    r123522 r123533  
    449449            'platform/mediastream/MediaStreamComponent.h',
    450450            'platform/mediastream/MediaStreamDescriptor.h',
    451             'platform/mediastream/MediaStreamSource.cpp',
    452451            'platform/mediastream/MediaStreamSource.h',
    453452            'platform/mediastream/PeerConnection00Handler.h',

  • trunk/Source/WebCore/dom/EventNames.h

    r123522 r123533  
    220220    macro(statechange) \
    221221    macro(removetrack) \
    222     macro(mute) \
    223     macro(unmute) \
    224222    \
    225223    macro(show) \

  • trunk/Source/WebCore/dom/EventTargetFactory.in

    r123522 r123533  
    1818MediaController conditional=VIDEO
    1919MediaStream conditional=MEDIA_STREAM
    20 MediaStreamTrack conditional=MEDIA_STREAM
    2120MediaStreamTrackList conditional=MEDIA_STREAM
    2221MessagePort

  • trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp

    r123499 r123533  
    9292}
    9393
     94// FIXME: Cleanup when the chromium code has switched to the split sources implementation.
     95void WebMediaStreamDescriptor::sources(WebVector<WebMediaStreamSource>& webSources) const
     96{
     97    size_t numberOfAudioSources = m_private->numberOfAudioComponents();
     98    size_t numberOfVideoSources = m_private->numberOfVideoComponents();
     99    WebVector<WebMediaStreamSource> result(numberOfAudioSources + numberOfVideoSources);
     100    size_t i = 0;
     101    for (size_t j = 0; j < numberOfAudioSources; ++i, ++j)
     102        result[i] = m_private->audioComponent(j)->source();
     103    for (size_t j = 0; j < numberOfVideoSources; ++i, ++j)
     104        result[i] = m_private->videoComponent(j)->source();
     105    webSources.swap(result);
     106}
     107
    94108void WebMediaStreamDescriptor::audioSources(WebVector<WebMediaStreamComponent>& webSources) const
    95109{

  • trunk/Source/WebCore/platform/chromium/support/WebMediaStreamSource.cpp

    r123499 r123533  
    9797}
    9898
    99 void WebMediaStreamSource::setReadyState(ReadyState state)
    100 {
    101     ASSERT(!m_private.isNull());
    102     m_private->setReadyState(static_cast<MediaStreamSource::ReadyState>(state));
    103 }
    104 
    105 WebMediaStreamSource::ReadyState WebMediaStreamSource::readyState() const
    106 {
    107     ASSERT(!m_private.isNull());
    108     return static_cast<ReadyState>(m_private->readyState());
    109 }
    110 
    11199} // namespace WebKit
    112100

  • trunk/Source/WebCore/platform/mediastream/MediaStreamSource.h

    r123499 r123533  
    4242class MediaStreamSource : public RefCounted<MediaStreamSource> {
    4343public:
    44     class Observer {
    45     public:
    46         virtual ~Observer() { }
    47         virtual void sourceChangedState() = 0;
    48     };
    49 
    5044    enum Type {
    5145        TypeAudio,
    … …  
    5347    };
    5448
    55     enum ReadyState {
    56         ReadyStateLive = 0,
    57         ReadyStateMuted = 1,
    58         ReadyStateEnded = 2
    59     };
    60 
    61     static PassRefPtr<MediaStreamSource> create(const String& id, Type, const String& name, ReadyState = ReadyStateLive);
     49    static PassRefPtr<MediaStreamSource> create(const String& id, Type type, const String& name)
     50    {
     51        return adoptRef(new MediaStreamSource(id, type, name));
     52    }
    6253
    6354    const String& id() const { return m_id; }
    … …  
    6556    const String& name() const { return m_name; }
    6657
    67     void setReadyState(ReadyState);
    68     ReadyState readyState() const { return m_readyState; }
    69 
    70     void addObserver(Observer*);
    71     void removeObserver(Observer*);
     58    bool muted() const { return m_muted; }
     59    void setMuted(bool muted) { m_muted = muted; }
    7260
    7361private:
    74     MediaStreamSource(const String& id, Type, const String& name, ReadyState);
     62    MediaStreamSource(const String& id, Type type, const String& name)
     63        : m_id(id)
     64        , m_type(type)
     65        , m_name(name)
     66        , m_muted(false)
     67    {
     68    }
    7569
    7670    String m_id;
    7771    Type m_type;
    7872    String m_name;
    79     ReadyState m_readyState;
    80     Vector<Observer*> m_observers;
     73    bool m_muted;
    8174};
    8275

  • trunk/Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.cpp

    r123499 r123533  
    6969void MediaStreamCenterChromium::queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClient> client)
    7070{
    71     if (m_private)
    72         m_private->queryMediaStreamSources(client);
    73     else {
    74         MediaStreamSourceVector audioSources, videoSources;
    75         client->didCompleteQuery(audioSources, videoSources);
    76     }
     71    // FIXME: Remove this "short-circuit" and forward to m_private when Chrome and DumpRenderTree has implemented WebMediaStreamCenter.
     72    MediaStreamSourceVector audioSources, videoSources;
     73    client->didCompleteQuery(audioSources, videoSources);
    7774}
    7875
    … …  
    104101{
    105102    if (m_private) {
     103        // FIXME: Remove when Chromium have switched to the new API.
     104        m_private->didConstructMediaStream(stream);
     105
    106106        WebKit::WebMediaStreamDescriptor webStream(stream);
    107107        m_private->didCreateMediaStream(webStream);

  • trunk/Source/WebKit/chromium/ChangeLog

    r123520 r123533  
     12012-07-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r123499.
     4        http://trac.webkit.org/changeset/123499
     5        https://bugs.webkit.org/show_bug.cgi?id=92161
     6
     7        Android fails to compile (Requested by zhenyao on #webkit).
     8
     9        * src/AssertMatchingEnums.cpp:
     10
    1112012-07-24  Terry Anderson  <tdanderson@chromium.org>
    212

  • trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

    r123499 r123533  
    538538COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::TypeAudio, MediaStreamSource::TypeAudio);
    539539COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::TypeVideo, MediaStreamSource::TypeVideo);
    540 COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::ReadyStateLive, MediaStreamSource::ReadyStateLive);
    541 COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::ReadyStateMuted, MediaStreamSource::ReadyStateMuted);
    542 COMPILE_ASSERT_MATCHING_ENUM(WebMediaStreamSource::ReadyStateEnded, MediaStreamSource::ReadyStateEnded);
    543540
    544541COMPILE_ASSERT_MATCHING_ENUM(WebICEOptions::CandidateTypeAll, IceOptions::ALL);

  • trunk/Tools/ChangeLog

    r123530 r123533  
     12012-07-24  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r123499.
     4        http://trac.webkit.org/changeset/123499
     5        https://bugs.webkit.org/show_bug.cgi?id=92161
     6
     7        Android fails to compile (Requested by zhenyao on #webkit).
     8
     9        * DumpRenderTree/DumpRenderTree.gypi:
     10        * DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp:
     11        (MockWebKitPlatformSupport::createMediaStreamCenter):
     12        * DumpRenderTree/chromium/MockWebKitPlatformSupport.h:
     13        (MockWebKitPlatformSupport):
     14        * DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp: Removed.
     15        * DumpRenderTree/chromium/MockWebMediaStreamCenter.h: Removed.
     16
    1172012-07-24  Dirk Pranke  <dpranke@chromium.org>
    218

  • trunk/Tools/DumpRenderTree/DumpRenderTree.gypi

    r123499 r123533  
    1717            'chromium/MockWebKitPlatformSupport.cpp',
    1818            'chromium/MockWebKitPlatformSupport.h',
    19             'chromium/MockWebMediaStreamCenter.cpp',
    20             'chromium/MockWebMediaStreamCenter.h',
    2119            'chromium/MockWebPrerenderingSupport.cpp',
    2220            'chromium/MockWebPrerenderingSupport.h',

  • trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp

    r123499 r123533  
    3232#include "MockWebKitPlatformSupport.h"
    3333
    34 #include "MockWebMediaStreamCenter.h"
    3534#include <wtf/Assertions.h>
    36 #include <wtf/PassOwnPtr.h>
    3735
    3836using namespace WebKit;
    … …  
    5654}
    5755
    58 WebMediaStreamCenter* MockWebKitPlatformSupport::createMediaStreamCenter(WebMediaStreamCenterClient* client)
     56WebMediaStreamCenter* MockWebKitPlatformSupport::createMediaStreamCenter(WebMediaStreamCenterClient*)
    5957{
    60     if (!m_mockMediaStreamCenter)
    61         m_mockMediaStreamCenter = adoptPtr(new MockWebMediaStreamCenter(client));
    62 
    63     return m_mockMediaStreamCenter.get();
     58    return 0;
    6459}

  • trunk/Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.h

    r123499 r123533  
    3333
    3434#include <public/Platform.h>
    35 #include <wtf/OwnPtr.h>
    3635#include <wtf/PassOwnPtr.h>
    3736
    … …  
    4746private:
    4847    MockWebKitPlatformSupport();
    49 
    50     OwnPtr<WebKit::WebMediaStreamCenter> m_mockMediaStreamCenter;
    5148};
    5249
Note: See TracChangeset for help on using the changeset viewer.