Changeset 126341 in webkit


Ignore:
Timestamp:
Aug 22, 2012 12:55:34 PM (12 years ago)
Author:
tommyw@google.com
Message:

[chromium] MediaStream API: Add MockWebRTCPeerConnectionHandler
​https://bugs.webkit.org/show_bug.cgi?id=93091

Reviewed by Adam Barth.

Source/WebCore:

Fixing a FIXME that the patch obsoletes.

Covered by existing tests.

  • platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:

(WebCore::RTCPeerConnectionHandlerChromium::initialize):

Tools:

Add a skeleton MockWebRTCPeerConnectionHandler to DumpRenderTree,
to complete the infrastructure for RTCPeerConnection.

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

(MockWebKitPlatformSupport::createRTCPeerConnectionHandler):

  • DumpRenderTree/chromium/MockWebKitPlatformSupport.h:

(MockWebKitPlatformSupport):

  • DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp:
  • DumpRenderTree/chromium/MockWebMediaStreamCenter.h:
  • DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp: Copied from Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.h.

(MockWebRTCPeerConnectionHandler::MockWebRTCPeerConnectionHandler):
(MockWebRTCPeerConnectionHandler::initialize):

  • DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h: Copied from Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.h.

(WebKit):
(MockWebRTCPeerConnectionHandler):
(MockWebRTCPeerConnectionHandler::MockWebRTCPeerConnectionHandler):

Location:
trunk
Files:
8 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r126340 r126341  
     12012-08-22  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API: Add MockWebRTCPeerConnectionHandler
     4        https://bugs.webkit.org/show_bug.cgi?id=93091
     5
     6        Reviewed by Adam Barth.
     7
     8        Fixing a FIXME that the patch obsoletes.
     9
     10        Covered by existing tests.
     11
     12        * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:
     13        (WebCore::RTCPeerConnectionHandlerChromium::initialize):
     14
    1152012-08-22  Eric Penner  <epenner@google.com>
    216

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

    r124460 r126341  
    5757{
    5858    m_webHandler = adoptPtr(WebKit::Platform::current()->createRTCPeerConnectionHandler(this));
    59     // FIXME: Change the default value to false once the mock WebRTCPeerConnectionHandler has landed.
    60     return m_webHandler ? m_webHandler->initialize() : true;
     59    return m_webHandler ? m_webHandler->initialize() : false;
    6160}
    6261

  • trunk/Tools/ChangeLog

    r126334 r126341  
     12012-08-22  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API: Add MockWebRTCPeerConnectionHandler
     4        https://bugs.webkit.org/show_bug.cgi?id=93091
     5
     6        Reviewed by Adam Barth.
     7
     8        Add a skeleton MockWebRTCPeerConnectionHandler to DumpRenderTree,
     9        to complete the infrastructure for RTCPeerConnection.
     10
     11        * DumpRenderTree/DumpRenderTree.gypi:
     12        * DumpRenderTree/chromium/MockWebKitPlatformSupport.cpp:
     13        (MockWebKitPlatformSupport::createRTCPeerConnectionHandler):
     14        * DumpRenderTree/chromium/MockWebKitPlatformSupport.h:
     15        (MockWebKitPlatformSupport):
     16        * DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp:
     17        * DumpRenderTree/chromium/MockWebMediaStreamCenter.h:
     18        * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp: Copied from Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.h.
     19        (MockWebRTCPeerConnectionHandler::MockWebRTCPeerConnectionHandler):
     20        (MockWebRTCPeerConnectionHandler::initialize):
     21        * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h: Copied from Tools/DumpRenderTree/chromium/MockWebKitPlatformSupport.h.
     22        (WebKit):
     23        (MockWebRTCPeerConnectionHandler):
     24        (MockWebRTCPeerConnectionHandler::MockWebRTCPeerConnectionHandler):
     25
    1262012-08-21  Ryosuke Niwa  <rniwa@webkit.org>
    227

  • trunk/Tools/DumpRenderTree/DumpRenderTree.gypi

    r125508 r126341  
    1919            'chromium/MockWebPrerenderingSupport.cpp',
    2020            'chromium/MockWebPrerenderingSupport.h',
     21            'chromium/MockWebRTCPeerConnectionHandler.cpp',
     22            'chromium/MockWebRTCPeerConnectionHandler.h',
    2123            'chromium/MockWebSpeechInputController.cpp',
    2224            'chromium/MockWebSpeechInputController.h',

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

    r124650 r126341  
    3333
    3434#include "MockWebMediaStreamCenter.h"
     35#include "MockWebRTCPeerConnectionHandler.h"
    3536#include <wtf/Assertions.h>
    3637#include <wtf/PassOwnPtr.h>
    … …  
    6465    return m_mockMediaStreamCenter.get();
    6566}
     67
     68WebRTCPeerConnectionHandler* MockWebKitPlatformSupport::createRTCPeerConnectionHandler(WebRTCPeerConnectionHandlerClient* client)
     69{
     70    return new MockWebRTCPeerConnectionHandler(client);
     71}
    6672#endif // ENABLE(MEDIA_STREAM)

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

    r124650 r126341  
    4545#if ENABLE(MEDIA_STREAM)
    4646    virtual WebKit::WebMediaStreamCenter* createMediaStreamCenter(WebKit::WebMediaStreamCenterClient*) OVERRIDE;
     47    virtual WebKit::WebRTCPeerConnectionHandler* createRTCPeerConnectionHandler(WebKit::WebRTCPeerConnectionHandlerClient*) OVERRIDE;
    4748#endif // ENABLE(MEDIA_STREAM)
    4849

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

    r124650 r126341  
    3434#include "MockWebMediaStreamCenter.h"
    3535
    36 #include "platform/WebICECandidateDescriptor.h"
    37 #include "platform/WebMediaStreamCenterClient.h"
    38 #include "platform/WebMediaStreamComponent.h"
    39 #include "platform/WebMediaStreamDescriptor.h"
    40 #include "platform/WebMediaStreamSource.h"
    41 #include "platform/WebMediaStreamSourcesRequest.h"
    42 #include "platform/WebSessionDescriptionDescriptor.h"
    43 #include "platform/WebVector.h"
     36#include <public/WebICECandidateDescriptor.h>
     37#include <public/WebMediaStreamCenterClient.h>
     38#include <public/WebMediaStreamComponent.h>
     39#include <public/WebMediaStreamDescriptor.h>
     40#include <public/WebMediaStreamSource.h>
     41#include <public/WebMediaStreamSourcesRequest.h>
     42#include <public/WebSessionDescriptionDescriptor.h>
     43#include <public/WebVector.h>
    4444
    4545using namespace WebKit;

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

    r124650 r126341  
    3333
    3434#if ENABLE(MEDIA_STREAM)
    35 #include "platform/WebMediaStreamCenter.h"
     35#include <public/WebMediaStreamCenter.h>
    3636
    3737namespace WebKit {

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

    r126340 r126341  
    2929 */
    3030
    31 #ifndef MockWebKitPlatformSupport_h
    32 #define MockWebKitPlatformSupport_h
     31#include "config.h"
     32#if ENABLE(MEDIA_STREAM)
    3333
    34 #include <public/Platform.h>
    35 #include <wtf/OwnPtr.h>
    36 #include <wtf/PassOwnPtr.h>
     34#include "MockWebRTCPeerConnectionHandler.h"
    3735
    38 class MockWebKitPlatformSupport : public WebKit::Platform {
    39 public:
    40     static PassOwnPtr<MockWebKitPlatformSupport> create();
    41     ~MockWebKitPlatformSupport();
     36#include <public/WebRTCPeerConnectionHandlerClient.h>
    4237
    43     virtual void cryptographicallyRandomValues(unsigned char* buffer, size_t length) OVERRIDE;
     38using namespace WebKit;
    4439
    45 #if ENABLE(MEDIA_STREAM)
    46     virtual WebKit::WebMediaStreamCenter* createMediaStreamCenter(WebKit::WebMediaStreamCenterClient*) OVERRIDE;
     40MockWebRTCPeerConnectionHandler::MockWebRTCPeerConnectionHandler(WebRTCPeerConnectionHandlerClient* client)
     41{
     42}
     43
     44bool MockWebRTCPeerConnectionHandler::initialize()
     45{
     46    return true;
     47}
     48
    4749#endif // ENABLE(MEDIA_STREAM)
    48 
    49 private:
    50     MockWebKitPlatformSupport();
    51 
    52 #if ENABLE(MEDIA_STREAM)
    53     OwnPtr<WebKit::WebMediaStreamCenter> m_mockMediaStreamCenter;
    54 #endif // ENABLE(MEDIA_STREAM)
    55 };
    56 
    57 #endif // MockWebKitPlatformSupport_h

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

    r126340 r126341  
    2929 */
    3030
    31 #ifndef MockWebKitPlatformSupport_h
    32 #define MockWebKitPlatformSupport_h
    33 
    34 #include <public/Platform.h>
    35 #include <wtf/OwnPtr.h>
    36 #include <wtf/PassOwnPtr.h>
    37 
    38 class MockWebKitPlatformSupport : public WebKit::Platform {
    39 public:
    40     static PassOwnPtr<MockWebKitPlatformSupport> create();
    41     ~MockWebKitPlatformSupport();
    42 
    43     virtual void cryptographicallyRandomValues(unsigned char* buffer, size_t length) OVERRIDE;
     31#ifndef MockWebRTCPeerConnectionHandler_h
     32#define MockWebRTCPeerConnectionHandler_h
    4433
    4534#if ENABLE(MEDIA_STREAM)
    46     virtual WebKit::WebMediaStreamCenter* createMediaStreamCenter(WebKit::WebMediaStreamCenterClient*) OVERRIDE;
     35#include <public/WebRTCPeerConnectionHandler.h>
     36
     37namespace WebKit {
     38class WebRTCPeerConnectionHandlerClient;
     39};
     40
     41class MockWebRTCPeerConnectionHandler : public WebKit::WebRTCPeerConnectionHandler {
     42public:
     43    explicit MockWebRTCPeerConnectionHandler(WebKit::WebRTCPeerConnectionHandlerClient*);
     44
     45    virtual bool initialize() OVERRIDE;
     46
     47private:
     48    MockWebRTCPeerConnectionHandler() { }
     49};
     50
    4751#endif // ENABLE(MEDIA_STREAM)
    4852
    49 private:
    50     MockWebKitPlatformSupport();
     53#endif // MockWebRTCPeerConnectionHandler_h
    5154
    52 #if ENABLE(MEDIA_STREAM)
    53     OwnPtr<WebKit::WebMediaStreamCenter> m_mockMediaStreamCenter;
    54 #endif // ENABLE(MEDIA_STREAM)
    55 };
    56 
    57 #endif // MockWebKitPlatformSupport_h
Note: See TracChangeset for help on using the changeset viewer.