Title: [142289] trunk
Revision
142289
Author
commit-qu...@webkit.org
Date
2013-02-08 09:05:28 -0800 (Fri, 08 Feb 2013)

Log Message

Source/WebCore: Fix and test for missing return statement

RTCPeerConnection.getStats() failed when remote stats were instantiated.
https://bugs.webkit.org/show_bug.cgi?id=109292

Patch by Harald Alvestrand <h...@google.com> on 2013-02-08
Reviewed by Adam Barth.

Tested by extending the existing mock's behaviour.

* Modules/mediastream/RTCStatsReport.cpp:
(WebCore::RTCStatsReport::addElement):

Tools: Fix and test for missing return

RTCPeerConnection.getStats() fails when remote stats are instantiated.
https://bugs.webkit.org/show_bug.cgi?id=109292

Patch by Harald Alvestrand <h...@google.com> on 2013-02-08
Reviewed by Adam Barth.

* DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
(MockWebRTCPeerConnectionHandler::getStats):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (142288 => 142289)


--- trunk/Source/WebCore/ChangeLog	2013-02-08 16:57:06 UTC (rev 142288)
+++ trunk/Source/WebCore/ChangeLog	2013-02-08 17:05:28 UTC (rev 142289)
@@ -1,3 +1,17 @@
+2013-02-08  Harald Alvestrand  <h...@google.com>
+
+        Fix and test for missing return statement
+
+        RTCPeerConnection.getStats() failed when remote stats were instantiated.
+        https://bugs.webkit.org/show_bug.cgi?id=109292
+
+        Reviewed by Adam Barth.
+
+        Tested by extending the existing mock's behaviour.
+
+        * Modules/mediastream/RTCStatsReport.cpp:
+        (WebCore::RTCStatsReport::addElement):
+
 2013-02-08  Anton Vayvod  <avay...@chromium.org>
 
         [Text Autosizing] Split isAutosizingCluster into three independent checks

Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp (142288 => 142289)


--- trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp	2013-02-08 16:57:06 UTC (rev 142288)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp	2013-02-08 17:05:28 UTC (rev 142289)
@@ -44,6 +44,7 @@
     if (isLocal) {
         ASSERT(!m_local);
         m_local = RTCStatsElement::create(timestamp);
+        return;
     }
     ASSERT(!m_remote);
     m_remote = RTCStatsElement::create(timestamp);

Modified: trunk/Tools/ChangeLog (142288 => 142289)


--- trunk/Tools/ChangeLog	2013-02-08 16:57:06 UTC (rev 142288)
+++ trunk/Tools/ChangeLog	2013-02-08 17:05:28 UTC (rev 142289)
@@ -1,3 +1,15 @@
+2013-02-08  Harald Alvestrand  <h...@google.com>
+
+        Fix and test for missing return
+
+        RTCPeerConnection.getStats() fails when remote stats are instantiated.
+        https://bugs.webkit.org/show_bug.cgi?id=109292
+
+        Reviewed by Adam Barth.
+
+        * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
+        (MockWebRTCPeerConnectionHandler::getStats):
+
 2013-02-08  Tommy Widenflycht  <tom...@google.com>
 
         MediaStream API: Removing the deprecated WebMediaStreamDescriptor and WebMediaStreamComponent shims

Modified: trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp (142288 => 142289)


--- trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp	2013-02-08 16:57:06 UTC (rev 142288)
+++ trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp	2013-02-08 17:05:28 UTC (rev 142289)
@@ -282,6 +282,8 @@
             reportIndex = response.addReport();
             response.addElement(reportIndex, true, currentDate);
             response.addStatistic(reportIndex, true, "type", "video");
+            // We add an empty remote report element.
+            response.addElement(reportIndex, false, currentDate);
         }
     }
     postTask(new RTCStatsRequestSucceededTask(this, request, response));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to