Title: [131814] trunk/Source
- Revision
- 131814
- Author
- [email protected]
- Date
- 2012-10-18 15:08:31 -0700 (Thu, 18 Oct 2012)
Log Message
MediaStream API: Do some cleanup in the chromium WebKit API
https://bugs.webkit.org/show_bug.cgi?id=99713
Reviewed by Adam Barth.
Source/Platform:
Removing the deprecated version of WebMediaStreamDescriptor::initialize and making
the two constructSDP functions in WebMediaStreamCenter optional to override.
This is part of the preparation to remove PeerConnection00.
* chromium/public/WebMediaStreamCenter.h:
(WebKit::WebMediaStreamCenter::constructSDP):
* chromium/public/WebMediaStreamDescriptor.h:
(WebMediaStreamDescriptor):
Source/WebCore:
Removing the deprecated version of WebMediaStreamDescriptor::initialize.
No testing needed since only an unused function is removed.
* platform/chromium/support/WebMediaStreamDescriptor.cpp:
Modified Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (131813 => 131814)
--- trunk/Source/Platform/ChangeLog 2012-10-18 22:07:06 UTC (rev 131813)
+++ trunk/Source/Platform/ChangeLog 2012-10-18 22:08:31 UTC (rev 131814)
@@ -1,3 +1,19 @@
+2012-10-18 Tommy Widenflycht <[email protected]>
+
+ MediaStream API: Do some cleanup in the chromium WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=99713
+
+ Reviewed by Adam Barth.
+
+ Removing the deprecated version of WebMediaStreamDescriptor::initialize and making
+ the two constructSDP functions in WebMediaStreamCenter optional to override.
+ This is part of the preparation to remove PeerConnection00.
+
+ * chromium/public/WebMediaStreamCenter.h:
+ (WebKit::WebMediaStreamCenter::constructSDP):
+ * chromium/public/WebMediaStreamDescriptor.h:
+ (WebMediaStreamDescriptor):
+
2012-10-17 Adrienne Walker <[email protected]>
[chromium] Make WebContentLayer include what it uses
Modified: trunk/Source/Platform/chromium/public/WebMediaStreamCenter.h (131813 => 131814)
--- trunk/Source/Platform/chromium/public/WebMediaStreamCenter.h 2012-10-18 22:07:06 UTC (rev 131813)
+++ trunk/Source/Platform/chromium/public/WebMediaStreamCenter.h 2012-10-18 22:08:31 UTC (rev 131814)
@@ -51,8 +51,8 @@
virtual bool didRemoveMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) { return false; };
virtual void didStopLocalMediaStream(const WebMediaStreamDescriptor&) = 0;
virtual void didCreateMediaStream(WebMediaStreamDescriptor&) = 0;
- virtual WebString constructSDP(const WebICECandidateDescriptor&) = 0;
- virtual WebString constructSDP(const WebSessionDescriptionDescriptor&) = 0;
+ virtual WebString constructSDP(const WebICECandidateDescriptor&) { return WebString(); }
+ virtual WebString constructSDP(const WebSessionDescriptionDescriptor&) { return WebString(); }
};
} // namespace WebKit
Modified: trunk/Source/Platform/chromium/public/WebMediaStreamDescriptor.h (131813 => 131814)
--- trunk/Source/Platform/chromium/public/WebMediaStreamDescriptor.h 2012-10-18 22:07:06 UTC (rev 131813)
+++ trunk/Source/Platform/chromium/public/WebMediaStreamDescriptor.h 2012-10-18 22:08:31 UTC (rev 131814)
@@ -59,9 +59,6 @@
WEBKIT_EXPORT void assign(const WebMediaStreamDescriptor&);
- // DEPRECATED
- WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamSource>&);
-
WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources);
WEBKIT_EXPORT void reset();
bool isNull() const { return m_private.isNull(); }
Modified: trunk/Source/WebCore/ChangeLog (131813 => 131814)
--- trunk/Source/WebCore/ChangeLog 2012-10-18 22:07:06 UTC (rev 131813)
+++ trunk/Source/WebCore/ChangeLog 2012-10-18 22:08:31 UTC (rev 131814)
@@ -1,3 +1,16 @@
+2012-10-18 Tommy Widenflycht <[email protected]>
+
+ MediaStream API: Do some cleanup in the chromium WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=99713
+
+ Reviewed by Adam Barth.
+
+ Removing the deprecated version of WebMediaStreamDescriptor::initialize.
+
+ No testing needed since only an unused function is removed.
+
+ * platform/chromium/support/WebMediaStreamDescriptor.cpp:
+
2012-10-18 Alpha Lam <[email protected]>
[chromium] Implement deferred image decoding
Modified: trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp (131813 => 131814)
--- trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp 2012-10-18 22:07:06 UTC (rev 131813)
+++ trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp 2012-10-18 22:08:31 UTC (rev 131814)
@@ -125,20 +125,6 @@
return m_private.get();
}
-// FIXME: Cleanup when the chromium code has switched to the split sources implementation.
-void WebMediaStreamDescriptor::initialize(const WebString& label, const WebVector<WebMediaStreamSource>& sources)
-{
- MediaStreamSourceVector audio, video;
- for (size_t i = 0; i < sources.size(); ++i) {
- MediaStreamSource* curr = sources[i];
- if (curr->type() == MediaStreamSource::TypeAudio)
- audio.append(curr);
- else if (curr->type() == MediaStreamSource::TypeVideo)
- video.append(curr);
- }
- m_private = MediaStreamDescriptor::create(label, audio, video);
-}
-
void WebMediaStreamDescriptor::initialize(const WebString& label, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources)
{
MediaStreamSourceVector audio, video;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
