Changeset 124421 in webkit


Ignore:
Timestamp:
Aug 2, 2012 1:23:13 AM (12 years ago)
Author:
tommyw@google.com
Message:

MediaStream API: Move RTCConfiguration to its proper place
​https://bugs.webkit.org/show_bug.cgi?id=92867

Reviewed by Adam Barth.

This patch moves RTCConfiguration to Source/WebCore/platform/mediastream,
and adds its WebKit interface for chromium.

Source/Platform:

  • Platform.gypi:
  • chromium/public/WebRTCConfiguration.h: Added.

(WebCore):
(WebKit):
(WebRTCICEServer):
(WebKit::WebRTCICEServer::WebRTCICEServer):
(WebKit::WebRTCICEServer::~WebRTCICEServer):
(WebKit::WebRTCICEServer::operator=):
(WebKit::WebRTCICEServer::isNull):
(WebRTCConfiguration):
(WebKit::WebRTCConfiguration::WebRTCConfiguration):
(WebKit::WebRTCConfiguration::~WebRTCConfiguration):
(WebKit::WebRTCConfiguration::operator=):
(WebKit::WebRTCConfiguration::isNull):

Source/WebCore:

No functional code changes.

  • GNUmakefile.list.am:
  • Modules/mediastream/RTCPeerConnection.cpp:
  • WebCore.gypi:
  • platform/chromium/support/WebRTCConfiguration.cpp: Added.

(WebKit):
(WebKit::WebRTCICEServer::WebRTCICEServer):
(WebKit::WebRTCICEServer::assign):
(WebKit::WebRTCICEServer::reset):
(WebKit::WebRTCICEServer::uri):
(WebKit::WebRTCICEServer::credential):
(WebKit::WebRTCConfiguration::WebRTCConfiguration):
(WebKit::WebRTCConfiguration::assign):
(WebKit::WebRTCConfiguration::reset):
(WebKit::WebRTCConfiguration::numberOfServers):
(WebKit::WebRTCConfiguration::server):

  • platform/mediastream/RTCConfiguration.h: Added.

(WebCore):
(RTCIceServer):
(WebCore::RTCIceServer::create):
(WebCore::RTCIceServer::~RTCIceServer):
(WebCore::RTCIceServer::uri):
(WebCore::RTCIceServer::credential):
(WebCore::RTCIceServer::RTCIceServer):
(RTCConfiguration):
(WebCore::RTCConfiguration::create):
(WebCore::RTCConfiguration::~RTCConfiguration):
(WebCore::RTCConfiguration::appendServer):
(WebCore::RTCConfiguration::numberOfServers):
(WebCore::RTCConfiguration::server):
(WebCore::RTCConfiguration::RTCConfiguration):

Location:
trunk/Source
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/Platform/ChangeLog

    r124396 r124421  
     12012-08-02  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Move RTCConfiguration to its proper place
     4        https://bugs.webkit.org/show_bug.cgi?id=92867
     5
     6        Reviewed by Adam Barth.
     7
     8        This patch moves RTCConfiguration to Source/WebCore/platform/mediastream,
     9        and adds its WebKit interface for chromium.
     10
     11        * Platform.gypi:
     12        * chromium/public/WebRTCConfiguration.h: Added.
     13        (WebCore):
     14        (WebKit):
     15        (WebRTCICEServer):
     16        (WebKit::WebRTCICEServer::WebRTCICEServer):
     17        (WebKit::WebRTCICEServer::~WebRTCICEServer):
     18        (WebKit::WebRTCICEServer::operator=):
     19        (WebKit::WebRTCICEServer::isNull):
     20        (WebRTCConfiguration):
     21        (WebKit::WebRTCConfiguration::WebRTCConfiguration):
     22        (WebKit::WebRTCConfiguration::~WebRTCConfiguration):
     23        (WebKit::WebRTCConfiguration::operator=):
     24        (WebKit::WebRTCConfiguration::isNull):
     25
    1262012-08-01  James Robinson  <jamesr@chromium.org>
    227

  • trunk/Source/Platform/Platform.gypi

    r124395 r124421  
    107107            'chromium/public/WebPrivateOwnPtr.h',
    108108            'chromium/public/WebPrivatePtr.h',
     109            'chromium/public/WebRTCConfiguration.h',
    109110            'chromium/public/WebRect.h',
    110111            'chromium/public/WebReferrerPolicy.h',

  • trunk/Source/WebCore/ChangeLog

    r124417 r124421  
     12012-08-02  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Move RTCConfiguration to its proper place
     4        https://bugs.webkit.org/show_bug.cgi?id=92867
     5
     6        Reviewed by Adam Barth.
     7
     8        This patch moves RTCConfiguration to Source/WebCore/platform/mediastream,
     9        and adds its WebKit interface for chromium.
     10
     11        No functional code changes.
     12
     13        * GNUmakefile.list.am:
     14        * Modules/mediastream/RTCPeerConnection.cpp:
     15        * WebCore.gypi:
     16        * platform/chromium/support/WebRTCConfiguration.cpp: Added.
     17        (WebKit):
     18        (WebKit::WebRTCICEServer::WebRTCICEServer):
     19        (WebKit::WebRTCICEServer::assign):
     20        (WebKit::WebRTCICEServer::reset):
     21        (WebKit::WebRTCICEServer::uri):
     22        (WebKit::WebRTCICEServer::credential):
     23        (WebKit::WebRTCConfiguration::WebRTCConfiguration):
     24        (WebKit::WebRTCConfiguration::assign):
     25        (WebKit::WebRTCConfiguration::reset):
     26        (WebKit::WebRTCConfiguration::numberOfServers):
     27        (WebKit::WebRTCConfiguration::server):
     28        * platform/mediastream/RTCConfiguration.h: Added.
     29        (WebCore):
     30        (RTCIceServer):
     31        (WebCore::RTCIceServer::create):
     32        (WebCore::RTCIceServer::~RTCIceServer):
     33        (WebCore::RTCIceServer::uri):
     34        (WebCore::RTCIceServer::credential):
     35        (WebCore::RTCIceServer::RTCIceServer):
     36        (RTCConfiguration):
     37        (WebCore::RTCConfiguration::create):
     38        (WebCore::RTCConfiguration::~RTCConfiguration):
     39        (WebCore::RTCConfiguration::appendServer):
     40        (WebCore::RTCConfiguration::numberOfServers):
     41        (WebCore::RTCConfiguration::server):
     42        (WebCore::RTCConfiguration::RTCConfiguration):
     43
    1442012-08-02  Alexander Shalamov  <alexander.shalamov@intel.com>
    245

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

    r124397 r124421  
    35623562        Source/WebCore/platform/mediastream/PeerConnection00Handler.h \
    35633563        Source/WebCore/platform/mediastream/PeerConnection00HandlerClient.h \
     3564        Source/WebCore/platform/mediastream/RTCConfiguration.h \
    35643565        Source/WebCore/platform/mediastream/SessionDescriptionDescriptor.cpp \
    35653566        Source/WebCore/platform/mediastream/SessionDescriptionDescriptor.h \

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

    r124193 r124421  
    3838#include "ExceptionCode.h"
    3939#include "KURL.h"
     40#include "RTCConfiguration.h"
    4041#include "ScriptExecutionContext.h"
    4142
    4243namespace WebCore {
    43 
    44 // FIXME: RTCIceServer and RTCConfigration are placed here temporarily.
    45 // Their final place is in Source/WebCore/platform/mediastream.
    46 class RTCIceServer : public RefCounted<RTCIceServer> {
    47 public:
    48     static PassRefPtr<RTCIceServer> create(const KURL& uri, const String& credential) { return adoptRef(new RTCIceServer(uri, credential)); }
    49     virtual ~RTCIceServer() { }
    50 
    51     const KURL& uri() { return m_uri; }
    52     const String& credential() { return m_credential; }
    53 
    54 private:
    55     RTCIceServer(const KURL& uri, const String& credential)
    56         : m_uri(uri)
    57         , m_credential(credential)
    58     {
    59     }
    60 
    61     KURL m_uri;
    62     String m_credential;
    63 };
    64 
    65 class RTCConfiguration : public RefCounted<RTCConfiguration> {
    66 public:
    67     static PassRefPtr<RTCConfiguration> create() { return adoptRef(new RTCConfiguration()); }
    68     virtual ~RTCConfiguration() { }
    69 
    70     void appendServer(PassRefPtr<RTCIceServer> server) { m_servers.append(server); }
    71     size_t numberOfServers() { return m_servers.size(); }
    72     RTCIceServer* server(size_t index) { return m_servers[index].get(); }
    73 
    74 private:
    75     RTCConfiguration() { }
    76 
    77     Vector<RefPtr<RTCIceServer> > m_servers;
    78 };
    7944
    8045PassRefPtr<RTCConfiguration> RTCPeerConnection::parseConfiguration(const Dictionary& configuration, ExceptionCode& ec)

  • trunk/Source/WebCore/WebCore.gypi

    r124375 r124421  
    451451            'platform/mediastream/PeerConnection00Handler.h',
    452452            'platform/mediastream/PeerConnection00HandlerClient.h',
     453            'platform/mediastream/RTCConfiguration.h',
    453454            'platform/mediastream/SessionDescriptionDescriptor.cpp',
    454455            'platform/mediastream/SessionDescriptionDescriptor.h',
    … …  
    82228223            'platform/chromium/support/WebICEOptions.cpp',
    82238224            'platform/chromium/support/WebMediaHints.cpp',
    8224             'platform/chromium/support/WebMediaHints.cpp',
    82258225            'platform/chromium/support/WebMediaStreamComponent.cpp',
    82268226            'platform/chromium/support/WebMediaStreamDescriptor.cpp',
    … …  
    82288228            'platform/chromium/support/WebMediaStreamSourcesRequest.cpp',
    82298229            'platform/chromium/support/WebPrerender.cpp',
     8230            'platform/chromium/support/WebRTCConfiguration.cpp',
    82308231            'platform/chromium/support/WebThreadSafeData.cpp',
    82318232            'platform/chromium/support/WebTransformationMatrix.cpp',
Note: See TracChangeset for help on using the changeset viewer.