| Index: public/platform/WebRTCConfiguration.h
|
| diff --git a/public/platform/WebRTCConfiguration.h b/public/platform/WebRTCConfiguration.h
|
| index 9398a49ac9e3c2964e563083400dd4aaf4b24bb2..44a863c09bf29b07e1f6e083ffd08f6d4cb0ccf8 100644
|
| --- a/public/platform/WebRTCConfiguration.h
|
| +++ b/public/platform/WebRTCConfiguration.h
|
| @@ -39,6 +39,7 @@
|
| namespace blink {
|
|
|
| class RTCIceServer;
|
| +class RTCIceServerArray;
|
| class RTCConfiguration;
|
| class WebString;
|
| class WebURL;
|
| @@ -72,6 +73,32 @@ private:
|
| WebPrivatePtr<RTCIceServer> m_private;
|
| };
|
|
|
| +class WebRTCICEServerArray {
|
| +public:
|
| + WebRTCICEServerArray() {}
|
| + WebRTCICEServerArray(const WebRTCICEServerArray& other) { assign(other); }
|
| + WebRTCICEServerArray& operator=(const WebRTCICEServerArray& other)
|
| + {
|
| + assign(other);
|
| + return *this;
|
| + }
|
| +
|
| + BLINK_PLATFORM_EXPORT void assign(const WebRTCICEServerArray&);
|
| +
|
| + BLINK_PLATFORM_EXPORT void reset();
|
| + bool isNull() const { return m_private.isNull(); }
|
| +
|
| + BLINK_PLATFORM_EXPORT size_t numberOfServers() const;
|
| + BLINK_PLATFORM_EXPORT WebRTCICEServer server(size_t index) const;
|
| +
|
| +#if INSIDE_BLINK
|
| + BLINK_PLATFORM_EXPORT WebRTCICEServerArray(RTCIceServerArray*);
|
| +#endif
|
| +
|
| +private:
|
| + WebPrivatePtr<RTCIceServerArray> m_private;
|
| +};
|
| +
|
| enum WebRTCIceTransports {
|
| WebRTCIceTransportsNone,
|
| WebRTCIceTransportsRelay,
|
| @@ -106,6 +133,7 @@ public:
|
| BLINK_PLATFORM_EXPORT void reset();
|
| bool isNull() const { return m_private.isNull(); }
|
|
|
| + // TODO(guoweis): Remove next 2 functions when WebKit rolls into Chromium.
|
| BLINK_PLATFORM_EXPORT size_t numberOfServers() const;
|
| BLINK_PLATFORM_EXPORT WebRTCICEServer server(size_t index) const;
|
|
|
| @@ -114,6 +142,7 @@ public:
|
| BLINK_PLATFORM_EXPORT WebRTCBundlePolicy bundlePolicy() const;
|
|
|
| BLINK_PLATFORM_EXPORT WebRTCRtcpMuxPolicy rtcpMuxPolicy() const;
|
| + BLINK_PLATFORM_EXPORT WebRTCICEServerArray iceServers() const;
|
|
|
| #if INSIDE_BLINK
|
| BLINK_PLATFORM_EXPORT WebRTCConfiguration(RTCConfiguration*);
|
|
|