Changeset 129672 in webkit


Ignore:
Timestamp:
Sep 26, 2012 11:11:44 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r129654.
http://trac.webkit.org/changeset/129654
https://bugs.webkit.org/show_bug.cgi?id=97702

breaks chromium windows build (Requested by schenney on
#webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-09-26

Source/Platform:

  • chromium/public/WebRTCPeerConnectionHandler.h:

(WebKit):
(WebRTCPeerConnectionHandler):

  • chromium/public/WebRTCStatsRequest.h: Removed.

Source/WebCore:

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • Modules/mediastream/RTCPeerConnection.cpp:
  • Modules/mediastream/RTCPeerConnection.h:

(WebCore):
(RTCPeerConnection):

  • Modules/mediastream/RTCPeerConnection.idl:
  • Modules/mediastream/RTCStatsCallback.h: Removed.
  • Modules/mediastream/RTCStatsCallback.idl: Removed.
  • Modules/mediastream/RTCStatsElement.cpp: Removed.
  • Modules/mediastream/RTCStatsElement.h: Removed.
  • Modules/mediastream/RTCStatsElement.idl: Removed.
  • Modules/mediastream/RTCStatsReport.cpp: Removed.
  • Modules/mediastream/RTCStatsReport.h: Removed.
  • Modules/mediastream/RTCStatsReport.idl: Removed.
  • Modules/mediastream/RTCStatsRequestImpl.cpp: Removed.
  • Modules/mediastream/RTCStatsRequestImpl.h: Removed.
  • Modules/mediastream/RTCStatsResponse.cpp: Removed.
  • Modules/mediastream/RTCStatsResponse.h: Removed.
  • Modules/mediastream/RTCStatsResponse.idl: Removed.
  • WebCore.gypi:
  • platform/chromium/support/WebRTCStatsRequest.cpp: Removed.
  • platform/mediastream/RTCPeerConnectionHandler.cpp:

(RTCPeerConnectionHandlerDummy):

  • platform/mediastream/RTCPeerConnectionHandler.h:

(WebCore):
(RTCPeerConnectionHandler):

  • platform/mediastream/RTCStatsRequest.h: Removed.
  • platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:
  • platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h:

(RTCPeerConnectionHandlerChromium):

Tools:

  • DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
  • DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h:

(MockWebRTCPeerConnectionHandler):

LayoutTests:

  • fast/mediastream/RTCPeerConnection-stats-expected.txt: Removed.
  • fast/mediastream/RTCPeerConnection-stats.html: Removed.
Location:
trunk
Files:
18 deleted
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r129671 r129672  
     12012-09-26  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r129654.
     4        http://trac.webkit.org/changeset/129654
     5        https://bugs.webkit.org/show_bug.cgi?id=97702
     6
     7        breaks chromium windows build (Requested by schenney on
     8        #webkit).
     9
     10        * fast/mediastream/RTCPeerConnection-stats-expected.txt: Removed.
     11        * fast/mediastream/RTCPeerConnection-stats.html: Removed.
     12
    1132012-09-26  Tullio Lucena  <tullio.lucena@openbossa.org>
    214
  • trunk/Source/Platform/ChangeLog

    r129654 r129672  
     12012-09-26  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r129654.
     4        http://trac.webkit.org/changeset/129654
     5        https://bugs.webkit.org/show_bug.cgi?id=97702
     6
     7        breaks chromium windows build (Requested by schenney on
     8        #webkit).
     9
     10        * chromium/public/WebRTCPeerConnectionHandler.h:
     11        (WebKit):
     12        (WebRTCPeerConnectionHandler):
     13        * chromium/public/WebRTCStatsRequest.h: Removed.
     14
    1152012-09-26  Harald Tveit Alvestrand  <harald@alvestrand.no>
    216
  • trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandler.h

    r129654 r129672  
    4040class WebRTCSessionDescription;
    4141class WebRTCSessionDescriptionRequest;
    42 class WebRTCStatsRequest;
    4342class WebRTCVoidRequest;
    4443
     
    5958    virtual bool addStream(const WebMediaStreamDescriptor&, const WebMediaConstraints&) = 0;
    6059    virtual void removeStream(const WebMediaStreamDescriptor&) = 0;
    61     // FIXME: Remove default implementation when clients have changed.
    62     virtual void getStats(const WebRTCStatsRequest&) { }
    6360    virtual void stop() = 0;
    6461};
  • trunk/Source/WebCore/CMakeLists.txt

    r129654 r129672  
    229229    Modules/mediastream/RTCSessionDescription.idl
    230230    Modules/mediastream/RTCSessionDescriptionCallback.idl
    231     Modules/mediastream/RTCStatsCallback.idl
    232     Modules/mediastream/RTCStatsElement.idl
    233     Modules/mediastream/RTCStatsReport.idl
    234     Modules/mediastream/RTCStatsResponse.idl
    235231    Modules/mediastream/SessionDescription.idl
    236232
     
    866862    Modules/mediastream/RTCSessionDescription.cpp
    867863    Modules/mediastream/RTCSessionDescriptionRequestImpl.cpp
    868     Modules/mediastream/RTCStatsElement.cpp
    869     Modules/mediastream/RTCStatsReport.cpp
    870     Modules/mediastream/RTCStatsRequestImpl.cpp
    871     Modules/mediastream/RTCStatsResponse.cpp
    872864    Modules/mediastream/RTCVoidRequestImpl.cpp
    873865    Modules/mediastream/SessionDescription.cpp
  • trunk/Source/WebCore/ChangeLog

    r129670 r129672  
     12012-09-26  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r129654.
     4        http://trac.webkit.org/changeset/129654
     5        https://bugs.webkit.org/show_bug.cgi?id=97702
     6
     7        breaks chromium windows build (Requested by schenney on
     8        #webkit).
     9
     10        * CMakeLists.txt:
     11        * GNUmakefile.list.am:
     12        * Modules/mediastream/RTCPeerConnection.cpp:
     13        * Modules/mediastream/RTCPeerConnection.h:
     14        (WebCore):
     15        (RTCPeerConnection):
     16        * Modules/mediastream/RTCPeerConnection.idl:
     17        * Modules/mediastream/RTCStatsCallback.h: Removed.
     18        * Modules/mediastream/RTCStatsCallback.idl: Removed.
     19        * Modules/mediastream/RTCStatsElement.cpp: Removed.
     20        * Modules/mediastream/RTCStatsElement.h: Removed.
     21        * Modules/mediastream/RTCStatsElement.idl: Removed.
     22        * Modules/mediastream/RTCStatsReport.cpp: Removed.
     23        * Modules/mediastream/RTCStatsReport.h: Removed.
     24        * Modules/mediastream/RTCStatsReport.idl: Removed.
     25        * Modules/mediastream/RTCStatsRequestImpl.cpp: Removed.
     26        * Modules/mediastream/RTCStatsRequestImpl.h: Removed.
     27        * Modules/mediastream/RTCStatsResponse.cpp: Removed.
     28        * Modules/mediastream/RTCStatsResponse.h: Removed.
     29        * Modules/mediastream/RTCStatsResponse.idl: Removed.
     30        * WebCore.gypi:
     31        * platform/chromium/support/WebRTCStatsRequest.cpp: Removed.
     32        * platform/mediastream/RTCPeerConnectionHandler.cpp:
     33        (RTCPeerConnectionHandlerDummy):
     34        * platform/mediastream/RTCPeerConnectionHandler.h:
     35        (WebCore):
     36        (RTCPeerConnectionHandler):
     37        * platform/mediastream/RTCStatsRequest.h: Removed.
     38        * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:
     39        * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h:
     40        (RTCPeerConnectionHandlerChromium):
     41
    1422012-09-26  Philip Rogers  <pdr@google.com>
    243
  • trunk/Source/WebCore/GNUmakefile.list.am

    r129654 r129672  
    640640        DerivedSources/WebCore/JSRTCSessionDescriptionCallback.cpp \
    641641        DerivedSources/WebCore/JSRTCSessionDescriptionCallback.h \
    642         DerivedSources/WebCore/JSRTCStatsCallback.cpp \
    643         DerivedSources/WebCore/JSRTCStatsCallback.h \
    644         DerivedSources/WebCore/JSRTCStatsElement.cpp \
    645         DerivedSources/WebCore/JSRTCStatsElement.h \
    646         DerivedSources/WebCore/JSRTCStatsReport.cpp \
    647         DerivedSources/WebCore/JSRTCStatsReport.h \
    648         DerivedSources/WebCore/JSRTCStatsResponse.cpp \
    649         DerivedSources/WebCore/JSRTCStatsResponse.h \
    650642        DerivedSources/WebCore/JSScreen.cpp \
    651643        DerivedSources/WebCore/JSScreen.h \
     
    12451237        $(WebCore)/Modules/mediastream/RTCSessionDescription.idl \
    12461238        $(WebCore)/Modules/mediastream/RTCSessionDescriptionCallback.idl \
    1247         $(WebCore)/Modules/mediastream/RTCStatsCallback.idl \
    1248         $(WebCore)/Modules/mediastream/RTCStatsElement.idl \
    1249         $(WebCore)/Modules/mediastream/RTCStatsReport.idl \
    1250         $(WebCore)/Modules/mediastream/RTCStatsResponse.idl \
    12511239        $(WebCore)/Modules/mediastream/SessionDescription.idl \
    12521240        $(WebCore)/Modules/navigatorcontentutils/NavigatorContentUtils.idl \
  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp

    r129654 r129672  
    4949#include "RTCSessionDescriptionDescriptor.h"
    5050#include "RTCSessionDescriptionRequestImpl.h"
    51 #include "RTCStatsCallback.h"
    52 #include "RTCStatsRequestImpl.h"
    5351#include "RTCVoidRequestImpl.h"
    5452#include "ScriptExecutionContext.h"
     
    382380}
    383381
    384 void RTCPeerConnection::getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<MediaStreamTrack> selector)
    385 {
    386     RefPtr<RTCStatsRequestImpl> statsRequest = RTCStatsRequestImpl::create(scriptExecutionContext(), successCallback);
    387     // FIXME: Add passing selector as part of the statsRequest.
    388     m_peerHandler->getStats(statsRequest.release());
    389 }
    390 
    391382void RTCPeerConnection::close(ExceptionCode& ec)
    392383{
  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h

    r129654 r129672  
    4848
    4949class MediaConstraints;
    50 class MediaStreamTrack;
    5150class RTCConfiguration;
    5251class RTCErrorCallback;
    5352class RTCSessionDescription;
    5453class RTCSessionDescriptionCallback;
    55 class RTCStatsCallback;
    5654class VoidCallback;
    5755
     
    8684
    8785    void removeStream(MediaStream*, ExceptionCode&);
    88 
    89     void getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<MediaStreamTrack> selector);
    9086
    9187    void close(ExceptionCode&);
  • trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl

    r129654 r129672  
    7373            raises(DOMException);
    7474
    75         void getStats(in [Callback] RTCStatsCallback successCallback, in [Optional=DefaultIsUndefined] MediaStreamTrack selector);
    76 
    7775        void close()
    7876            raises(DOMException);
  • trunk/Source/WebCore/WebCore.gypi

    r129654 r129672  
    466466            'platform/mediastream/RTCSessionDescriptionDescriptor.h',
    467467            'platform/mediastream/RTCSessionDescriptionRequest.h',
    468             'platform/mediastream/RTCStatsRequest.h',
    469468            'platform/mediastream/RTCVoidRequest.h',
    470469            'platform/mediastream/SessionDescriptionDescriptor.cpp',
     
    875874            'Modules/mediastream/RTCSessionDescription.idl',
    876875            'Modules/mediastream/RTCSessionDescriptionCallback.idl',
    877             'Modules/mediastream/RTCStatsCallback.idl',
    878             'Modules/mediastream/RTCStatsElement.idl',
    879             'Modules/mediastream/RTCStatsReport.idl',
    880             'Modules/mediastream/RTCStatsResponse.idl',
    881876            'Modules/mediastream/SessionDescription.idl',
    882877            'Modules/navigatorcontentutils/NavigatorContentUtils.idl',
     
    16271622            'Modules/mediastream/RTCSessionDescriptionRequestImpl.cpp',
    16281623            'Modules/mediastream/RTCSessionDescriptionRequestImpl.h',
    1629             'Modules/mediastream/RTCStatsElement.cpp',
    1630             'Modules/mediastream/RTCStatsElement.h',
    1631             'Modules/mediastream/RTCStatsReport.cpp',
    1632             'Modules/mediastream/RTCStatsReport.h',
    1633             'Modules/mediastream/RTCStatsRequestImpl.cpp',
    1634             'Modules/mediastream/RTCStatsRequestImpl.h',
    1635             'Modules/mediastream/RTCStatsResponse.cpp',
    1636             'Modules/mediastream/RTCStatsResponse.h',
    16371624            'Modules/mediastream/RTCVoidRequestImpl.cpp',
    16381625            'Modules/mediastream/RTCVoidRequestImpl.h',
     
    84018388            'platform/chromium/support/WebRTCSessionDescription.cpp',
    84028389            'platform/chromium/support/WebRTCSessionDescriptionRequest.cpp',
    8403             'platform/chromium/support/WebRTCStatsRequest.cpp',
    84048390            'platform/chromium/support/WebRTCVoidRequest.cpp',
    84058391            'platform/chromium/support/WebScrollbarThemeGeometryNative.cpp',
  • trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp

    r129654 r129672  
    6060    virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaConstraints>) OVERRIDE;
    6161    virtual void removeStream(PassRefPtr<MediaStreamDescriptor>) OVERRIDE;
    62     virtual void getStats(PassRefPtr<RTCStatsRequest>) OVERRIDE;
    6362    virtual void stop() OVERRIDE;
    6463
     
    132131}
    133132
    134 void RTCPeerConnectionHandlerDummy::getStats(PassRefPtr<RTCStatsRequest>)
    135 {
    136 }
    137 
    138133void RTCPeerConnectionHandlerDummy::stop()
    139134{
  • trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h

    r129654 r129672  
    4646class RTCSessionDescriptionDescriptor;
    4747class RTCSessionDescriptionRequest;
    48 class RTCStatsRequest;
    4948class RTCVoidRequest;
    5049
     
    6665    virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaConstraints>) = 0;
    6766    virtual void removeStream(PassRefPtr<MediaStreamDescriptor>) = 0;
    68     virtual void getStats(PassRefPtr<RTCStatsRequest>) = 0;
    6967    virtual void stop() = 0;
    7068
  • trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp

    r129654 r129672  
    4949#include <public/WebRTCSessionDescription.h>
    5050#include <public/WebRTCSessionDescriptionRequest.h>
    51 #include <public/WebRTCStatsRequest.h>
    5251#include <public/WebRTCVoidRequest.h>
    5352#include <wtf/PassOwnPtr.h>
     
    158157}
    159158
    160 void RTCPeerConnectionHandlerChromium::getStats(PassRefPtr<RTCStatsRequest> request)
    161 {
    162     if (!m_webHandler)
    163         return;
    164 
    165     m_webHandler->getStats(request);
    166 }
    167 
    168159void RTCPeerConnectionHandlerChromium::stop()
    169160{
  • trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h

    r129654 r129672  
    6565    virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaConstraints>) OVERRIDE;
    6666    virtual void removeStream(PassRefPtr<MediaStreamDescriptor>) OVERRIDE;
    67     virtual void getStats(PassRefPtr<RTCStatsRequest>) OVERRIDE;
    6867    virtual void stop() OVERRIDE;
    6968
  • trunk/Tools/ChangeLog

    r129663 r129672  
     12012-09-26  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r129654.
     4        http://trac.webkit.org/changeset/129654
     5        https://bugs.webkit.org/show_bug.cgi?id=97702
     6
     7        breaks chromium windows build (Requested by schenney on
     8        #webkit).
     9
     10        * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
     11        * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h:
     12        (MockWebRTCPeerConnectionHandler):
     13
    1142012-09-26  Michael Saboff  <msaboff@apple.com>
    215
  • trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp

    r129654 r129672  
    3838#include <public/WebRTCSessionDescription.h>
    3939#include <public/WebRTCSessionDescriptionRequest.h>
    40 #include <public/WebRTCStatsRequest.h>
    4140#include <public/WebRTCVoidRequest.h>
    4241#include <public/WebString.h>
     
    8180};
    8281
    83 class RTCStatsRequestSucceededTask : public MethodTask<MockWebRTCPeerConnectionHandler> {
    84 public:
    85     RTCStatsRequestSucceededTask(MockWebRTCPeerConnectionHandler* object, const WebKit::WebRTCStatsRequest& request)
    86         : MethodTask<MockWebRTCPeerConnectionHandler>(object)
    87         , m_request(request)
    88     {
    89     }
    90 
    91     virtual void runIfValid() OVERRIDE
    92     {
    93         m_request.requestSucceeded();
    94     }
    95 
    96 private:
    97     WebKit::WebRTCStatsRequest m_request;
    98 };
    99 
    10082class RTCVoidRequestTask : public MethodTask<MockWebRTCPeerConnectionHandler> {
    10183public:
     
    242224}
    243225
    244 void MockWebRTCPeerConnectionHandler::getStats(const WebRTCStatsRequest& request)
    245 {
    246     postTask(new RTCStatsRequestSucceededTask(this, request));
    247 }
    248 
    249 
    250226void MockWebRTCPeerConnectionHandler::stop()
    251227{
  • trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h

    r129654 r129672  
    3838#include <public/WebRTCSessionDescription.h>
    3939#include <public/WebRTCSessionDescriptionRequest.h>
    40 #include <public/WebRTCStatsRequest.h>
    4140
    4241namespace WebKit {
     
    6059    virtual bool addStream(const WebKit::WebMediaStreamDescriptor&, const WebKit::WebMediaConstraints&) OVERRIDE;
    6160    virtual void removeStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE;
    62     virtual void getStats(const WebKit::WebRTCStatsRequest&) OVERRIDE;
    6361    virtual void stop() OVERRIDE;
    6462
Note: See TracChangeset for help on using the changeset viewer.