Changeset 129761 in webkit

Timestamp:

Sep 27, 2012 6:44:06 AM (12 years ago)

Author:

tommyw@google.com

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/chromium/MockConstraints.cpp (modified) (1 diff)
• DumpRenderTree/chromium/MockConstraints.h (modified) (1 diff)
• DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp (modified) (1 diff)
• DumpRenderTree/chromium/WebUserMediaClientMock.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-27  Tommy Widenflycht  <tommyw@google.com>
+
+        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  <tommyw@google.com>
 

trunk/Tools/DumpRenderTree/chromium/MockConstraints.cpp

@@ -50 +50 @@
 }
 
-bool verify(const WebMediaConstraints& constraints)
+bool verifyConstraints(const WebMediaConstraints& constraints)
 {
     WebVector<WebString> mandatoryConstraintNames;

trunk/Tools/DumpRenderTree/chromium/MockConstraints.h

@@ -40 +40 @@
 namespace MockConstraints {
 
-bool verify(const WebKit::WebMediaConstraints&);
+bool verifyConstraints(const WebKit::WebMediaConstraints&);
 
 } // namespace MockConstraints

trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp

@@ -112 +112 @@
 bool MockWebRTCPeerConnectionHandler::initialize(const WebRTCConfiguration&, const WebMediaConstraints& constraints)
 {
-    return MockConstraints::verify(constraints);
+    return MockConstraints::verifyConstraints(constraints);
 }
 

trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp

@@ -91 +91 @@
 
     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;