Diff
Modified: trunk/Source/Platform/ChangeLog (142287 => 142288)
--- trunk/Source/Platform/ChangeLog 2013-02-08 16:40:52 UTC (rev 142287)
+++ trunk/Source/Platform/ChangeLog 2013-02-08 16:57:06 UTC (rev 142288)
@@ -1,3 +1,14 @@
+2013-02-08 Tommy Widenflycht <[email protected]>
+
+ MediaStream API: Removing the deprecated WebMediaStreamDescriptor and WebMediaStreamComponent shims
+ https://bugs.webkit.org/show_bug.cgi?id=109296
+
+ Reviewed by Adam Barth.
+
+ * Platform.gypi:
+ * chromium/public/WebMediaStreamComponent.h: Removed.
+ * chromium/public/WebMediaStreamDescriptor.h: Removed.
+
2013-02-07 Eberhard Graether <[email protected]>
Web Inspector: Add settings checkbox for composited layer borders
Modified: trunk/Source/Platform/Platform.gypi (142287 => 142288)
--- trunk/Source/Platform/Platform.gypi 2013-02-08 16:40:52 UTC (rev 142287)
+++ trunk/Source/Platform/Platform.gypi 2013-02-08 16:57:06 UTC (rev 142288)
@@ -85,9 +85,7 @@
'chromium/public/WebMediaConstraints.h',
'chromium/public/WebMediaStreamCenter.h',
'chromium/public/WebMediaStreamCenterClient.h',
- 'chromium/public/WebMediaStreamComponent.h',
'chromium/public/WebMediaStream.h',
- 'chromium/public/WebMediaStreamDescriptor.h',
'chromium/public/WebMediaStreamSource.h',
'chromium/public/WebMediaStreamSourcesRequest.h',
'chromium/public/WebMediaStreamTrack.h',
Deleted: trunk/Source/Platform/chromium/public/WebMediaStreamComponent.h (142287 => 142288)
--- trunk/Source/Platform/chromium/public/WebMediaStreamComponent.h 2013-02-08 16:40:52 UTC (rev 142287)
+++ trunk/Source/Platform/chromium/public/WebMediaStreamComponent.h 2013-02-08 16:57:06 UTC (rev 142288)
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebMediaStreamComponent_h
-#define WebMediaStreamComponent_h
-
-#include <public/WebMediaStreamTrack.h>
-
-// The name WebMediaStreamComponent is EXTREMELY DEPRECATED.
-#define WebMediaStreamComponent WebMediaStreamTrack
-
-#endif // WebMediaStreamComponent_h
Deleted: trunk/Source/Platform/chromium/public/WebMediaStreamDescriptor.h (142287 => 142288)
--- trunk/Source/Platform/chromium/public/WebMediaStreamDescriptor.h 2013-02-08 16:40:52 UTC (rev 142287)
+++ trunk/Source/Platform/chromium/public/WebMediaStreamDescriptor.h 2013-02-08 16:57:06 UTC (rev 142288)
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebMediaStreamDescriptor_h
-#define WebMediaStreamDescriptor_h
-
-#include <public/WebMediaStream.h>
-
-// The name WebMediaStreamDescriptor is EXTREMELY DEPRECATED.
-#define WebMediaStreamDescriptor WebMediaStream
-
-#endif // WebMediaStreamDescriptor_h
Modified: trunk/Tools/ChangeLog (142287 => 142288)
--- trunk/Tools/ChangeLog 2013-02-08 16:40:52 UTC (rev 142287)
+++ trunk/Tools/ChangeLog 2013-02-08 16:57:06 UTC (rev 142288)
@@ -1,3 +1,17 @@
+2013-02-08 Tommy Widenflycht <[email protected]>
+
+ MediaStream API: Removing the deprecated WebMediaStreamDescriptor and WebMediaStreamComponent shims
+ https://bugs.webkit.org/show_bug.cgi?id=109296
+
+ Reviewed by Adam Barth.
+
+ * DumpRenderTree/chromium/MockWebRTCDTMFSenderHandler.cpp:
+ (MockWebRTCDTMFSenderHandler::MockWebRTCDTMFSenderHandler):
+ * DumpRenderTree/chromium/MockWebRTCDTMFSenderHandler.h:
+ (MockWebRTCDTMFSenderHandler):
+ * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
+ (MockWebRTCPeerConnectionHandler::createDTMFSender):
+
2013-02-08 Caio Marcelo de Oliveira Filho <[email protected]>
Update my entries in the watchlist
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebRTCDTMFSenderHandler.cpp (142287 => 142288)
--- trunk/Tools/DumpRenderTree/chromium/MockWebRTCDTMFSenderHandler.cpp 2013-02-08 16:40:52 UTC (rev 142287)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebRTCDTMFSenderHandler.cpp 2013-02-08 16:57:06 UTC (rev 142288)
@@ -57,7 +57,7 @@
/////////////////////
-MockWebRTCDTMFSenderHandler::MockWebRTCDTMFSenderHandler(const WebMediaStreamComponent& track)
+MockWebRTCDTMFSenderHandler::MockWebRTCDTMFSenderHandler(const WebMediaStreamTrack& track)
: m_client(0)
, m_track(track)
{
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebRTCDTMFSenderHandler.h (142287 => 142288)
--- trunk/Tools/DumpRenderTree/chromium/MockWebRTCDTMFSenderHandler.h 2013-02-08 16:40:52 UTC (rev 142287)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebRTCDTMFSenderHandler.h 2013-02-08 16:57:06 UTC (rev 142288)
@@ -27,13 +27,13 @@
#define MockWebRTCDTMFSenderHandler_h
#include "WebTask.h"
-#include <public/WebMediaStreamComponent.h>
+#include <public/WebMediaStreamTrack.h>
#include <public/WebRTCDTMFSenderHandler.h>
#include <public/WebString.h>
class MockWebRTCDTMFSenderHandler : public WebKit::WebRTCDTMFSenderHandler {
public:
- MockWebRTCDTMFSenderHandler(const WebKit::WebMediaStreamComponent&);
+ explicit MockWebRTCDTMFSenderHandler(const WebKit::WebMediaStreamTrack&);
virtual void setClient(WebKit::WebRTCDTMFSenderHandlerClient*) OVERRIDE;
@@ -50,7 +50,7 @@
MockWebRTCDTMFSenderHandler();
WebKit::WebRTCDTMFSenderHandlerClient* m_client;
- WebKit::WebMediaStreamComponent m_track;
+ WebKit::WebMediaStreamTrack m_track;
WebKit::WebString m_toneBuffer;
WebTestRunner::WebTaskList m_taskList;
};
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp (142287 => 142288)
--- trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp 2013-02-08 16:40:52 UTC (rev 142287)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp 2013-02-08 16:57:06 UTC (rev 142288)
@@ -294,7 +294,7 @@
return new MockWebRTCDataChannelHandler(label, reliable);
}
-WebRTCDTMFSenderHandler* MockWebRTCPeerConnectionHandler::createDTMFSender(const WebMediaStreamComponent& track)
+WebRTCDTMFSenderHandler* MockWebRTCPeerConnectionHandler::createDTMFSender(const WebMediaStreamTrack& track)
{
return new MockWebRTCDTMFSenderHandler(track);
}
