Skip to content
  • zmo@google.com's avatar
    Unreviewed, rolling out r123499. · 352fec37
    zmo@google.com authored
    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.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@123533 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    352fec37