Title: [129761] trunk/Tools
- Revision
- 129761
- Author
- [email protected]
- Date
- 2012-09-27 06:44:06 -0700 (Thu, 27 Sep 2012)
Log Message
MediaStream API: Rename MockConstraints::verify to verifyConstraints
https://bugs.webkit.org/show_bug.cgi?id=97779
Reviewed by Csaba Osztrogonác.
The Mac OS X sdk has a macro called verify :/
* DumpRenderTree/chromium/MockConstraints.cpp:
(MockConstraints::verifyConstraints):
* DumpRenderTree/chromium/MockConstraints.h:
(MockConstraints):
* DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
(MockWebRTCPeerConnectionHandler::initialize):
* DumpRenderTree/chromium/WebUserMediaClientMock.cpp:
(WebUserMediaClientMock::requestUserMedia):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (129760 => 129761)
--- trunk/Tools/ChangeLog 2012-09-27 13:28:34 UTC (rev 129760)
+++ trunk/Tools/ChangeLog 2012-09-27 13:44:06 UTC (rev 129761)
@@ -1,5 +1,23 @@
2012-09-27 Tommy Widenflycht <[email protected]>
+ MediaStream API: Rename MockConstraints::verify to verifyConstraints
+ https://bugs.webkit.org/show_bug.cgi?id=97779
+
+ Reviewed by Csaba Osztrogonác.
+
+ The Mac OS X sdk has a macro called verify :/
+
+ * DumpRenderTree/chromium/MockConstraints.cpp:
+ (MockConstraints::verifyConstraints):
+ * DumpRenderTree/chromium/MockConstraints.h:
+ (MockConstraints):
+ * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
+ (MockWebRTCPeerConnectionHandler::initialize):
+ * DumpRenderTree/chromium/WebUserMediaClientMock.cpp:
+ (WebUserMediaClientMock::requestUserMedia):
+
+2012-09-27 Tommy Widenflycht <[email protected]>
+
MediaStream API: Update getUserMedia to match the latest specification
https://bugs.webkit.org/show_bug.cgi?id=97540
Modified: trunk/Tools/DumpRenderTree/chromium/MockConstraints.cpp (129760 => 129761)
--- trunk/Tools/DumpRenderTree/chromium/MockConstraints.cpp 2012-09-27 13:28:34 UTC (rev 129760)
+++ trunk/Tools/DumpRenderTree/chromium/MockConstraints.cpp 2012-09-27 13:44:06 UTC (rev 129761)
@@ -49,7 +49,7 @@
return isSupported(constraint) || constraint == "valid_but_unsupported_1" || constraint == "valid_but_unsupported_2";
}
-bool verify(const WebMediaConstraints& constraints)
+bool verifyConstraints(const WebMediaConstraints& constraints)
{
WebVector<WebString> mandatoryConstraintNames;
constraints.getMandatoryConstraintNames(mandatoryConstraintNames);
Modified: trunk/Tools/DumpRenderTree/chromium/MockConstraints.h (129760 => 129761)
--- trunk/Tools/DumpRenderTree/chromium/MockConstraints.h 2012-09-27 13:28:34 UTC (rev 129760)
+++ trunk/Tools/DumpRenderTree/chromium/MockConstraints.h 2012-09-27 13:44:06 UTC (rev 129761)
@@ -39,7 +39,7 @@
namespace MockConstraints {
-bool verify(const WebKit::WebMediaConstraints&);
+bool verifyConstraints(const WebKit::WebMediaConstraints&);
} // namespace MockConstraints
Modified: trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp (129760 => 129761)
--- trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp 2012-09-27 13:28:34 UTC (rev 129760)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp 2012-09-27 13:44:06 UTC (rev 129761)
@@ -111,7 +111,7 @@
bool MockWebRTCPeerConnectionHandler::initialize(const WebRTCConfiguration&, const WebMediaConstraints& constraints)
{
- return MockConstraints::verify(constraints);
+ return MockConstraints::verifyConstraints(constraints);
}
void MockWebRTCPeerConnectionHandler::createOffer(const WebRTCSessionDescriptionRequest& request, const WebMediaConstraints& constraints)
Modified: trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp (129760 => 129761)
--- trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp 2012-09-27 13:28:34 UTC (rev 129760)
+++ trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp 2012-09-27 13:44:06 UTC (rev 129761)
@@ -90,12 +90,12 @@
}
WebMediaConstraints constraints = request.audioConstraints();
- if (!constraints.isNull() && !MockConstraints::verify(constraints)) {
+ if (!constraints.isNull() && !MockConstraints::verifyConstraints(constraints)) {
postTask(new UserMediaRequestTask(this, request, WebMediaStreamDescriptor()));
return;
}
constraints = request.videoConstraints();
- if (!constraints.isNull() && !MockConstraints::verify(constraints)) {
+ if (!constraints.isNull() && !MockConstraints::verifyConstraints(constraints)) {
postTask(new UserMediaRequestTask(this, request, WebMediaStreamDescriptor()));
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
