Title: [140017] trunk/Source/WebCore
- Revision
- 140017
- Author
- tom...@google.com
- Date
- 2013-01-17 11:48:14 -0800 (Thu, 17 Jan 2013)
Log Message
MediaStream API: Move all ExtraDataContainers into anonymous namespaces
https://bugs.webkit.org/show_bug.cgi?id=107128
Reviewed by Kentaro Hara.
Tests not needed.
* platform/chromium/support/WebMediaStreamDescriptor.cpp:
* platform/chromium/support/WebMediaStreamSource.cpp:
* platform/chromium/support/WebRTCSessionDescriptionRequest.cpp:
* platform/chromium/support/WebRTCVoidRequest.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (140016 => 140017)
--- trunk/Source/WebCore/ChangeLog 2013-01-17 19:47:00 UTC (rev 140016)
+++ trunk/Source/WebCore/ChangeLog 2013-01-17 19:48:14 UTC (rev 140017)
@@ -1,3 +1,17 @@
+2013-01-17 Tommy Widenflycht <tom...@google.com>
+
+ MediaStream API: Move all ExtraDataContainers into anonymous namespaces
+ https://bugs.webkit.org/show_bug.cgi?id=107128
+
+ Reviewed by Kentaro Hara.
+
+ Tests not needed.
+
+ * platform/chromium/support/WebMediaStreamDescriptor.cpp:
+ * platform/chromium/support/WebMediaStreamSource.cpp:
+ * platform/chromium/support/WebRTCSessionDescriptionRequest.cpp:
+ * platform/chromium/support/WebRTCVoidRequest.cpp:
+
2013-01-17 Yury Semikhatsky <yu...@chromium.org>
Web Inspector: InstrumentingAgents should be registered in InspectorInstrumentation only when there is a front-end
Modified: trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp (140016 => 140017)
--- trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp 2013-01-17 19:47:00 UTC (rev 140016)
+++ trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp 2013-01-17 19:48:14 UTC (rev 140017)
@@ -48,6 +48,20 @@
namespace WebKit {
+namespace {
+
+class ExtraDataContainer : public MediaStreamDescriptor::ExtraData {
+public:
+ ExtraDataContainer(WebMediaStreamDescriptor::ExtraData* extraData) : m_extraData(adoptPtr(extraData)) { }
+
+ WebMediaStreamDescriptor::ExtraData* extraData() { return m_extraData.get(); }
+
+private:
+ OwnPtr<WebMediaStreamDescriptor::ExtraData> m_extraData;
+};
+
+} // namespace
+
WebMediaStreamDescriptor::WebMediaStreamDescriptor(const PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor)
: m_private(mediaStreamDescriptor)
{
@@ -73,16 +87,6 @@
return m_private->id();
}
-class ExtraDataContainer : public WebCore::MediaStreamDescriptor::ExtraData {
-public:
- ExtraDataContainer(WebMediaStreamDescriptor::ExtraData* extraData) : m_extraData(WTF::adoptPtr(extraData)) { }
-
- WebMediaStreamDescriptor::ExtraData* extraData() { return m_extraData.get(); }
-
-private:
- OwnPtr<WebMediaStreamDescriptor::ExtraData> m_extraData;
-};
-
WebMediaStreamDescriptor::ExtraData* WebMediaStreamDescriptor::extraData() const
{
RefPtr<MediaStreamDescriptor::ExtraData> data = ""
Modified: trunk/Source/WebCore/platform/chromium/support/WebMediaStreamSource.cpp (140016 => 140017)
--- trunk/Source/WebCore/platform/chromium/support/WebMediaStreamSource.cpp 2013-01-17 19:47:00 UTC (rev 140016)
+++ trunk/Source/WebCore/platform/chromium/support/WebMediaStreamSource.cpp 2013-01-17 19:48:14 UTC (rev 140017)
@@ -46,6 +46,20 @@
namespace WebKit {
+namespace {
+
+class ExtraDataContainer : public MediaStreamSource::ExtraData {
+public:
+ ExtraDataContainer(WebMediaStreamSource::ExtraData* extraData) : m_extraData(adoptPtr(extraData)) { }
+
+ WebMediaStreamSource::ExtraData* extraData() { return m_extraData.get(); }
+
+private:
+ OwnPtr<WebMediaStreamSource::ExtraData> m_extraData;
+};
+
+} // namespace
+
WebMediaStreamSource::WebMediaStreamSource(const PassRefPtr<MediaStreamSource>& mediaStreamSource)
: m_private(mediaStreamSource)
{
@@ -112,16 +126,6 @@
return static_cast<ReadyState>(m_private->readyState());
}
-class ExtraDataContainer : public WebCore::MediaStreamSource::ExtraData {
-public:
- ExtraDataContainer(WebMediaStreamSource::ExtraData* extraData) : m_extraData(WTF::adoptPtr(extraData)) { }
-
- WebMediaStreamSource::ExtraData* extraData() { return m_extraData.get(); }
-
-private:
- OwnPtr<WebMediaStreamSource::ExtraData> m_extraData;
-};
-
WebMediaStreamSource::ExtraData* WebMediaStreamSource::extraData() const
{
ASSERT(!m_private.isNull());
Modified: trunk/Source/WebCore/platform/chromium/support/WebRTCSessionDescriptionRequest.cpp (140016 => 140017)
--- trunk/Source/WebCore/platform/chromium/support/WebRTCSessionDescriptionRequest.cpp 2013-01-17 19:47:00 UTC (rev 140016)
+++ trunk/Source/WebCore/platform/chromium/support/WebRTCSessionDescriptionRequest.cpp 2013-01-17 19:48:14 UTC (rev 140017)
@@ -43,6 +43,20 @@
namespace WebKit {
+namespace {
+
+class ExtraDataContainer : public RTCSessionDescriptionRequest::ExtraData {
+public:
+ ExtraDataContainer(WebRTCSessionDescriptionRequest::ExtraData* extraData) : m_extraData(adoptPtr(extraData)) { }
+
+ WebRTCSessionDescriptionRequest::ExtraData* extraData() { return m_extraData.get(); }
+
+private:
+ OwnPtr<WebRTCSessionDescriptionRequest::ExtraData> m_extraData;
+};
+
+} // namespace
+
WebRTCSessionDescriptionRequest::WebRTCSessionDescriptionRequest(const PassRefPtr<RTCSessionDescriptionRequest>& constraints)
: m_private(constraints)
{
@@ -70,16 +84,6 @@
m_private->requestFailed(error);
}
-class ExtraDataContainer : public WebCore::RTCSessionDescriptionRequest::ExtraData {
-public:
- ExtraDataContainer(WebRTCSessionDescriptionRequest::ExtraData* extraData) : m_extraData(WTF::adoptPtr(extraData)) { }
-
- WebRTCSessionDescriptionRequest::ExtraData* extraData() { return m_extraData.get(); }
-
-private:
- OwnPtr<WebRTCSessionDescriptionRequest::ExtraData> m_extraData;
-};
-
WebRTCSessionDescriptionRequest::ExtraData* WebRTCSessionDescriptionRequest::extraData() const
{
RefPtr<RTCSessionDescriptionRequest::ExtraData> data = ""
Modified: trunk/Source/WebCore/platform/chromium/support/WebRTCVoidRequest.cpp (140016 => 140017)
--- trunk/Source/WebCore/platform/chromium/support/WebRTCVoidRequest.cpp 2013-01-17 19:47:00 UTC (rev 140016)
+++ trunk/Source/WebCore/platform/chromium/support/WebRTCVoidRequest.cpp 2013-01-17 19:48:14 UTC (rev 140017)
@@ -41,6 +41,20 @@
namespace WebKit {
+namespace {
+
+class ExtraDataContainer : public RTCVoidRequest::ExtraData {
+public:
+ ExtraDataContainer(WebRTCVoidRequest::ExtraData* extraData) : m_extraData(adoptPtr(extraData)) { }
+
+ WebRTCVoidRequest::ExtraData* extraData() { return m_extraData.get(); }
+
+private:
+ OwnPtr<WebRTCVoidRequest::ExtraData> m_extraData;
+};
+
+} // namespace
+
WebRTCVoidRequest::WebRTCVoidRequest(const PassRefPtr<RTCVoidRequest>& constraints)
: m_private(constraints)
{
@@ -68,16 +82,6 @@
m_private->requestFailed(error);
}
-class ExtraDataContainer : public WebCore::RTCVoidRequest::ExtraData {
-public:
- ExtraDataContainer(WebRTCVoidRequest::ExtraData* extraData) : m_extraData(WTF::adoptPtr(extraData)) { }
-
- WebRTCVoidRequest::ExtraData* extraData() { return m_extraData.get(); }
-
-private:
- OwnPtr<WebRTCVoidRequest::ExtraData> m_extraData;
-};
-
WebRTCVoidRequest::ExtraData* WebRTCVoidRequest::extraData() const
{
RefPtr<RTCVoidRequest::ExtraData> data = ""
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
