Attachment 133277 Details for Bug 81924 – Patch

[patch] Patch

bug-81924-20120322172728.patch (text/plain), 8.28 KB, created by Tommy Widenflycht on 2012-03-22 09:27:30 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tommy Widenflycht

Created: 2012-03-22 09:27:30 PDT

Size: 8.28 KB

patch

obsolete

>Subversion Revision: 111590
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 6c6c46c8cd538709b99c0c10f68158e04b40b907..1dbfb8ccb440212f5dab8d0ffed8591f3086678d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2012-03-22  Tommy Widenflycht  <tommyw@google.com>
>+
>+        [chromium] MediaStream API (JSEP): Extending WebMediaStreamCenter
>+        https://bugs.webkit.org/show_bug.cgi?id=81924
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Nothing to test, just moving methods.
>+
>+        * platform/mediastream/MediaStreamCenter.cpp:
>+        (WebCore::MediaStreamCenter::constructSDP):
>+        (WebCore):
>+
> 2012-03-21  Xingnan Wang  <xingnan.wang@intel.com>
> 
>         Web audio layout test failed in debug with an ASSERT error in ReverbConvolverStage.cpp
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 4b38196f26f869e203dc063331ef2e8053a43734..081e18b6af0f709834ba6070bc9301d2ccad639b 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,26 @@
>+2012-03-22  Tommy Widenflycht  <tommyw@google.com>
>+
>+        [chromium] MediaStream API (JSEP): Extending WebMediaStreamCenter
>+        https://bugs.webkit.org/show_bug.cgi?id=81924
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Adding the two constructSDP methods.
>+
>+        * bridge/MediaStreamCenter.cpp:
>+        (WebCore::MediaStreamCenter::constructSDP):
>+        (WebCore):
>+        * bridge/MediaStreamCenterInternal.cpp:
>+        (WebCore::MediaStreamCenterInternal::constructSDP):
>+        (WebCore):
>+        * bridge/MediaStreamCenterInternal.h:
>+        (WebCore):
>+        (MediaStreamCenterInternal):
>+        * public/platform/WebMediaStreamCenter.h:
>+        (WebKit):
>+        (WebMediaStreamCenter):
>+        (WebKit::WebMediaStreamCenter::constructSDP):
>+
> 2012-03-21  Tommy Widenflycht  <tommyw@google.com>
> 
>         [chromium] MediaStream API (JSEP): Enhancing WebMediaHints and WebICEOptions
>diff --git a/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp b/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp
>index 21652ee2a355921e70be543ec8f93b9316d9d495..f6d26c1d6c27c23d6070d4d76f6979c5404d03c9 100644
>--- a/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp
>+++ b/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp
>@@ -58,16 +58,6 @@ void MediaStreamCenter::endLocalMediaStream(MediaStreamDescriptor* streamDescrip
>         streamDescriptor->setEnded();
> }
> 
>-String MediaStreamCenter::constructSDP(IceCandidateDescriptor*)
>-{
>-    return "";
>-}
>-
>-String MediaStreamCenter::constructSDP(SessionDescriptionDescriptor*)
>-{
>-    return "";
>-}
>-
> #if !PLATFORM(CHROMIUM)
> 
> // Empty implementations for ports that build with MEDIA_STREAM enabled by default, but haven't yet implemented MediaStreamCenter.
>@@ -98,6 +88,16 @@ void MediaStreamCenter::didConstructMediaStream(MediaStreamDescriptor*)
> {
> }
> 
>+String MediaStreamCenter::constructSDP(IceCandidateDescriptor*)
>+{
>+    return "";
>+}
>+
>+String MediaStreamCenter::constructSDP(SessionDescriptorDescriptor*)
>+{
>+    return "";
>+}
>+
> #endif // !PLATFORM(CHROMIUM)
> 
> } // namespace WebCore
>diff --git a/Source/WebKit/chromium/bridge/MediaStreamCenter.cpp b/Source/WebKit/chromium/bridge/MediaStreamCenter.cpp
>index 99f636d5366a1c14d36da2d57de8f87e286ca398..e9592a890efe3b55769288872005e10734c79bef 100644
>--- a/Source/WebKit/chromium/bridge/MediaStreamCenter.cpp
>+++ b/Source/WebKit/chromium/bridge/MediaStreamCenter.cpp
>@@ -69,6 +69,16 @@ void MediaStreamCenter::didConstructMediaStream(MediaStreamDescriptor* stream)
>     m_private->didConstructMediaStream(stream);
> }
> 
>+String MediaStreamCenter::constructSDP(IceCandidateDescriptor* iceCandidate)
>+{
>+    return m_private->constructSDP(iceCandidate);
>+}
>+
>+String MediaStreamCenter::constructSDP(SessionDescriptionDescriptor* sessionDescription)
>+{
>+    return m_private->constructSDP(sessionDescription);
>+}
>+
> } // namespace WebCore
> 
> #endif // ENABLE(MEDIA_STREAM)
>diff --git a/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.cpp b/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.cpp
>index a8693b4794b9d690af4fa41ba85fd18311db953e..5ad8ad0f19cb05723da019b5008ad99eba474dc1 100644
>--- a/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.cpp
>+++ b/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.cpp
>@@ -34,15 +34,19 @@
> 
> #include "MediaStreamCenterInternal.h"
> 
>+#include "IceCandidateDescriptor.h"
> #include "MediaStreamCenter.h"
> #include "MediaStreamComponent.h"
> #include "MediaStreamSource.h"
>+#include "SessionDescriptionDescriptor.h"
> #include "WebKit.h"
>+#include "platform/WebICECandidateDescriptor.h"
> #include "platform/WebKitPlatformSupport.h"
> #include "platform/WebMediaStreamCenter.h"
> #include "platform/WebMediaStreamComponent.h"
> #include "platform/WebMediaStreamDescriptor.h"
> #include "platform/WebMediaStreamSourcesRequest.h"
>+#include "platform/WebSessionDescriptionDescriptor.h"
> #include <wtf/PassOwnPtr.h>
> 
> namespace WebCore {
>@@ -86,6 +90,16 @@ void MediaStreamCenterInternal::didConstructMediaStream(MediaStreamDescriptor* s
>         m_private->didConstructMediaStream(stream);
> }
> 
>+String MediaStreamCenterInternal::constructSDP(IceCandidateDescriptor* iceCandidate)
>+{
>+    return m_private ? m_private->constructSDP(WebKit::WebICECandidateDescriptor(iceCandidate)) : "";
>+}
>+
>+String MediaStreamCenterInternal::constructSDP(SessionDescriptionDescriptor* sessionDescription)
>+{
>+    return m_private ? m_private->constructSDP(WebKit::WebSessionDescriptionDescriptor(sessionDescription)) : "";
>+}
>+
> void MediaStreamCenterInternal::stopLocalMediaStream(const WebKit::WebMediaStreamDescriptor& stream)
> {
>     m_owner->endLocalMediaStream(stream);
>diff --git a/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.h b/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.h
>index f5c3d8ada99c05cb44fa37f69b0e2854404c6730..9229423cf66fc7456bf5608f562ea55a7eb09684 100644
>--- a/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.h
>+++ b/Source/WebKit/chromium/bridge/MediaStreamCenterInternal.h
>@@ -36,6 +36,7 @@
> #include "platform/WebMediaStreamCenterClient.h"
> #include <wtf/OwnPtr.h>
> #include <wtf/PassRefPtr.h>
>+#include <wtf/text/WTFString.h>
> 
> namespace WebKit {
> class WebMediaStreamCenter;
>@@ -43,10 +44,12 @@ class WebMediaStreamCenter;
> 
> namespace WebCore {
> 
>+class IceCandidateDescriptor;
> class MediaStreamCenter;
> class MediaStreamComponent;
> class MediaStreamDescriptor;
> class MediaStreamSourcesQueryClient;
>+class SessionDescriptionDescriptor;
> 
> class MediaStreamCenterInternal : public WebKit::WebMediaStreamCenterClient {
> public:
>@@ -57,6 +60,8 @@ public:
>     void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*);
>     void didStopLocalMediaStream(MediaStreamDescriptor*);
>     void didConstructMediaStream(MediaStreamDescriptor*);
>+    String constructSDP(IceCandidateDescriptor*);
>+    String constructSDP(SessionDescriptionDescriptor*);
> 
>     // From WebKit::WebMediaStreamCenterClient.
>     virtual void stopLocalMediaStream(const WebKit::WebMediaStreamDescriptor&);
>diff --git a/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h b/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h
>index 8381a9a4c4567940695e07cbda9662484b022810..38827c833daec765d706e874d0a27ef031f2c108 100644
>--- a/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h
>+++ b/Source/WebKit/chromium/public/platform/WebMediaStreamCenter.h
>@@ -31,11 +31,14 @@
> #ifndef WebMediaStreamCenter_h
> #define WebMediaStreamCenter_h
> 
>-namespace WebKit {
>+#include "WebString.h"
> 
>+namespace WebKit {
>+class WebICECandidateDescriptor;
> class WebMediaStreamComponent;
> class WebMediaStreamDescriptor;
> class WebMediaStreamSourcesRequest;
>+class WebSessionDescriptionDescriptor;
> 
> class WebMediaStreamCenter {
> public:
>@@ -46,6 +49,10 @@ public:
>     virtual void didDisableMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) = 0;
>     virtual void didStopLocalMediaStream(const WebMediaStreamDescriptor&) = 0;
>     virtual void didConstructMediaStream(const WebMediaStreamDescriptor&) = 0;
>+
>+    // FIXME: Make pure virtual after implementation.
>+    virtual WebString constructSDP(const WebICECandidateDescriptor&) { return WebString(); }
>+    virtual WebString constructSDP(const WebSessionDescriptionDescriptor&) { return WebString(); }
> };
> 
> } // namespace WebKit

Actions: View | Formatted Diff | Diff

Attachments on bug 81924: 133277 | 133281