Diff
Modified: trunk/LayoutTests/ChangeLog (128981 => 128982)
--- trunk/LayoutTests/ChangeLog 2012-09-19 09:39:17 UTC (rev 128981)
+++ trunk/LayoutTests/ChangeLog 2012-09-19 09:43:27 UTC (rev 128982)
@@ -1,3 +1,15 @@
+2012-09-19 Tommy Widenflycht <tom...@google.com>
+
+ MediaStream API: Rename the RTCIceServer uri parameter to url.
+ https://bugs.webkit.org/show_bug.cgi?id=97086
+
+ Reviewed by Hajime Morita.
+
+ * fast/mediastream/RTCPeerConnection-expected.txt:
+ * fast/mediastream/RTCPeerConnection.html:
+ * fast/mediastream/constructors-expected.txt:
+ * fast/mediastream/constructors.html:
+
2012-09-19 Balazs Ankes <b...@inf.u-szeged.hu>
[Qt] REGRESSION(r128910): inspector/extensions/extensions-panel.html fails
Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt (128981 => 128982)
--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt 2012-09-19 09:39:17 UTC (rev 128981)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt 2012-09-19 09:43:27 UTC (rev 128982)
@@ -11,9 +11,9 @@
PASS new webkitRTCPeerConnection(''); threw exception TypeError: Not an object..
PASS new webkitRTCPeerConnection(null, ''); threw exception TypeError: Not an object..
PASS new webkitRTCPeerConnection({iceServers:[]}, null); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{uri:'stun:foo.com'}]}, null); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{uri:'turn:foo.com', credential:'x'}]}, null); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{uri:'turn:foo.com', credential:'x'},{uri:'stun:bar.com'}]}, null); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{url:'stun:foo.com'}]}, null); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'}]}, null); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'},{url:'stun:bar.com'}]}, null); did not throw exception.
PASS new webkitRTCPeerConnection({fooServers:[]}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
PASS new webkitRTCPeerConnection({iceServers:true}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
PASS new webkitRTCPeerConnection({iceServers:[1, 2, 3]}, null); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
Modified: trunk/LayoutTests/fast/mediastream/RTCPeerConnection.html (128981 => 128982)
--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection.html 2012-09-19 09:39:17 UTC (rev 128981)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection.html 2012-09-19 09:43:27 UTC (rev 128982)
@@ -16,9 +16,9 @@
shouldThrow("new webkitRTCPeerConnection(null, '');");
shouldNotThrow("new webkitRTCPeerConnection({iceServers:[]}, null);");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{uri:'stun:foo.com'}]}, null);");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{uri:'turn:foo.com', credential:'x'}]}, null);");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{uri:'turn:foo.com', credential:'x'},{uri:'stun:bar.com'}]}, null);");
+shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{url:'stun:foo.com'}]}, null);");
+shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'}]}, null);");
+shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{url:'turn:foo.com', credential:'x'},{url:'stun:bar.com'}]}, null);");
shouldThrow("new webkitRTCPeerConnection({fooServers:[]}, null);");
shouldThrow("new webkitRTCPeerConnection({iceServers:true}, null);");
shouldThrow("new webkitRTCPeerConnection({iceServers:[1, 2, 3]}, null);");
Modified: trunk/LayoutTests/fast/mediastream/constructors-expected.txt (128981 => 128982)
--- trunk/LayoutTests/fast/mediastream/constructors-expected.txt 2012-09-19 09:39:17 UTC (rev 128981)
+++ trunk/LayoutTests/fast/mediastream/constructors-expected.txt 2012-09-19 09:43:27 UTC (rev 128982)
@@ -18,7 +18,7 @@
PASS new webkitPeerConnection00('STUN foobar.com:12345', function(){}); did not throw exception.
PASS new SessionDescription(''); did not throw exception.
PASS new IceCandidate('', ''); did not throw exception.
-PASS new webkitRTCPeerConnection({iceServers:[{uri:'stun://foobar.com:12345'}]}, null); did not throw exception.
+PASS new webkitRTCPeerConnection({iceServers:[{url:'stun://foobar.com:12345'}]}, null); did not throw exception.
PASS new RTCSessionDescription({type:'offer',sdp:'foobar'}); did not throw exception.
PASS new RTCIceCandidate({candidate:'foo'}); did not throw exception.
PASS successfullyParsed is true
Modified: trunk/LayoutTests/fast/mediastream/constructors.html (128981 => 128982)
--- trunk/LayoutTests/fast/mediastream/constructors.html 2012-09-19 09:39:17 UTC (rev 128981)
+++ trunk/LayoutTests/fast/mediastream/constructors.html 2012-09-19 09:43:27 UTC (rev 128982)
@@ -27,7 +27,7 @@
shouldNotThrow("new webkitPeerConnection00('STUN foobar.com:12345', function(){});");
shouldNotThrow("new SessionDescription('');");
shouldNotThrow("new IceCandidate('', '');");
-shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{uri:'stun://foobar.com:12345'}]}, null);");
+shouldNotThrow("new webkitRTCPeerConnection({iceServers:[{url:'stun://foobar.com:12345'}]}, null);");
shouldNotThrow("new RTCSessionDescription({type:'offer',sdp:'foobar'});");
shouldNotThrow("new RTCIceCandidate({candidate:'foo'});");
Modified: trunk/Source/WebCore/ChangeLog (128981 => 128982)
--- trunk/Source/WebCore/ChangeLog 2012-09-19 09:39:17 UTC (rev 128981)
+++ trunk/Source/WebCore/ChangeLog 2012-09-19 09:43:27 UTC (rev 128982)
@@ -1,3 +1,18 @@
+2012-09-19 Tommy Widenflycht <tom...@google.com>
+
+ MediaStream API: Rename the RTCIceServer uri parameter to url.
+ https://bugs.webkit.org/show_bug.cgi?id=97086
+
+ Reviewed by Hajime Morita.
+
+ Either the standard has changed or I can't read.
+ http://dev.w3.org/2011/webrtc/editor/webrtc.html#dictionary-rtciceserver-members
+
+ Existing tests changed to cover this patch.
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::parseConfiguration):
+
2012-09-19 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r128976.
Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (128981 => 128982)
--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2012-09-19 09:39:17 UTC (rev 128981)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2012-09-19 09:43:27 UTC (rev 128982)
@@ -83,13 +83,13 @@
return 0;
}
- String uri, credential;
- ok = iceServer.get("uri", uri);
+ String urlString, credential;
+ ok = iceServer.get("url", urlString);
if (!ok) {
ec = TYPE_MISMATCH_ERR;
return 0;
}
- KURL url(KURL(), uri);
+ KURL url(KURL(), urlString);
if (!url.isValid() || !(url.protocolIs("turn") || url.protocolIs("stun"))) {
ec = TYPE_MISMATCH_ERR;
return 0;
