Title: [146364] trunk/Source
Revision
146364
Author
commit-qu...@webkit.org
Date
2013-03-20 11:06:12 -0700 (Wed, 20 Mar 2013)

Log Message

Remove Local/Remote and RTCStatsElement from WebRTCStats API
https://bugs.webkit.org/show_bug.cgi?id=112678

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

Source/Platform:

* chromium/public/WebRTCStatsResponse.h:
(WebRTCStatsResponse):

Source/WebCore:

Pure removal, remaining functionality covered by existing test.

* Modules/mediastream/RTCStatsReport.cpp:
* Modules/mediastream/RTCStatsReport.h:
(RTCStatsReport):
* Modules/mediastream/RTCStatsResponse.cpp:
* Modules/mediastream/RTCStatsResponse.h:
(RTCStatsResponse):
* platform/chromium/support/WebRTCStatsResponse.cpp:
* platform/mediastream/RTCStatsResponseBase.h:
(RTCStatsResponseBase):

Modified Paths

Diff

Modified: trunk/Source/Platform/ChangeLog (146363 => 146364)


--- trunk/Source/Platform/ChangeLog	2013-03-20 17:56:11 UTC (rev 146363)
+++ trunk/Source/Platform/ChangeLog	2013-03-20 18:06:12 UTC (rev 146364)
@@ -1,3 +1,13 @@
+2013-03-20  Harald Alvestrand  <h...@google.com>
+
+        Remove Local/Remote and RTCStatsElement from WebRTCStats API
+        https://bugs.webkit.org/show_bug.cgi?id=112678
+
+        Reviewed by Adam Barth.
+
+        * chromium/public/WebRTCStatsResponse.h:
+        (WebRTCStatsResponse):
+
 2013-03-20  Aaron Colwell  <acolw...@chromium.org>
 
         Add support for MediaSource::isTypeSupported()

Modified: trunk/Source/Platform/chromium/public/WebRTCStatsResponse.h (146363 => 146364)


--- trunk/Source/Platform/chromium/public/WebRTCStatsResponse.h	2013-03-20 17:56:11 UTC (rev 146363)
+++ trunk/Source/Platform/chromium/public/WebRTCStatsResponse.h	2013-03-20 18:06:12 UTC (rev 146364)
@@ -53,12 +53,6 @@
 
     WEBKIT_EXPORT size_t addReport(WebString id, WebString type, double timestamp);
     WEBKIT_EXPORT void addStatistic(size_t report, WebString name, WebString value);
-    // DEPRECATED
-    WEBKIT_EXPORT size_t addReport();
-    // DEPRECATED
-    WEBKIT_EXPORT void addElement(size_t report, bool isLocal, double timestamp);
-    // DEPRECATED
-    WEBKIT_EXPORT void addStatistic(size_t report, bool isLocal, WebString name, WebString value);
 
 #if WEBKIT_IMPLEMENTATION
     WebRTCStatsResponse(const WTF::PassRefPtr<WebCore::RTCStatsResponseBase>&);

Modified: trunk/Source/WebCore/ChangeLog (146363 => 146364)


--- trunk/Source/WebCore/ChangeLog	2013-03-20 17:56:11 UTC (rev 146363)
+++ trunk/Source/WebCore/ChangeLog	2013-03-20 18:06:12 UTC (rev 146364)
@@ -1,3 +1,22 @@
+2013-03-20  Harald Alvestrand  <h...@google.com>
+
+        Remove Local/Remote and RTCStatsElement from WebRTCStats API
+        https://bugs.webkit.org/show_bug.cgi?id=112678
+
+        Reviewed by Adam Barth.
+
+        Pure removal, remaining functionality covered by existing test.
+
+        * Modules/mediastream/RTCStatsReport.cpp:
+        * Modules/mediastream/RTCStatsReport.h:
+        (RTCStatsReport):
+        * Modules/mediastream/RTCStatsResponse.cpp:
+        * Modules/mediastream/RTCStatsResponse.h:
+        (RTCStatsResponse):
+        * platform/chromium/support/WebRTCStatsResponse.cpp:
+        * platform/mediastream/RTCStatsResponseBase.h:
+        (RTCStatsResponseBase):
+
 2013-03-20  Xingnan Wang  <xingnan.w...@intel.com>
 
         ASSERTION FAILED: !m_renderingAutomaticPullNodes.size()

Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp (146363 => 146364)


--- trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp	2013-03-20 17:56:11 UTC (rev 146363)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp	2013-03-20 18:06:12 UTC (rev 146364)
@@ -1,3 +1,4 @@
+
 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
@@ -32,11 +33,6 @@
 
 namespace WebCore {
 
-PassRefPtr<RTCStatsReport> RTCStatsReport::create()
-{
-    return adoptRef(new RTCStatsReport("inner fake ID", "inner fake type", 0));
-}
-
 PassRefPtr<RTCStatsReport> RTCStatsReport::create(const String& id, const String& type, double timestamp)
 {
     return adoptRef(new RTCStatsReport(id, type, timestamp));
@@ -73,18 +69,6 @@
     m_stats.add(name, value);
 }
 
-void RTCStatsReport::addElement(bool isLocal, double timestamp)
-{
-    // We ignore isLocal.
-    m_timestamp = timestamp;
-}
-
-void RTCStatsReport::addStatistic(bool isLocal, const String& name, const String& value)
-{
-    // We ignore isLocal.
-    addStatistic(name, value);
-}
-
 } // namespace WebCore
 
 #endif // ENABLE(MEDIA_STREAM)

Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.h (146363 => 146364)


--- trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.h	2013-03-20 17:56:11 UTC (rev 146363)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsReport.h	2013-03-20 18:06:12 UTC (rev 146364)
@@ -36,8 +36,6 @@
 class RTCStatsReport : public RefCounted<RTCStatsReport> {
 public:
     static PassRefPtr<RTCStatsReport> create(const String& id, const String& type, double timestamp);
-    // DEPRECATED
-    static PassRefPtr<RTCStatsReport> create();
 
     double timestamp() const { return m_timestamp; }
     String id() { return m_id; }
@@ -50,10 +48,6 @@
     const PassRefPtr<RTCStatsReport> remote();
 
     void addStatistic(const String& name, const String& value);
-    // DEPRECATED
-    void addElement(bool isLocal, double timestamp);
-    // DEPRECATED
-    void addStatistic(bool isLocal, const String& name, const String& value);
 
 private:
     RTCStatsReport(const String& id, const String& type, double timestamp);

Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp (146363 => 146364)


--- trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp	2013-03-20 17:56:11 UTC (rev 146363)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp	2013-03-20 18:06:12 UTC (rev 146364)
@@ -59,25 +59,6 @@
     m_result[report]->addStatistic(name, value);
 }
 
-// DEPRECATED
-size_t RTCStatsResponse::addReport()
-{
-    String fakeId = String::format("Fake ID %lu", (unsigned long) m_result.size());
-    return addReport(fakeId, "no type", 0);
-}
-
-void RTCStatsResponse::addElement(size_t report, bool isLocal, double timestamp)
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(report >= 0 && report < m_result.size());
-    m_result[report]->addElement(isLocal, timestamp);
-}
-
-void RTCStatsResponse::addStatistic(size_t report, bool isLocal, String name, String value)
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(report >= 0 && report < m_result.size());
-    m_result[report]->addStatistic(isLocal, name, value);
-}
-
 } // namespace WebCore
 
 #endif // ENABLE(MEDIA_STREAM)

Modified: trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.h (146363 => 146364)


--- trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.h	2013-03-20 17:56:11 UTC (rev 146363)
+++ trunk/Source/WebCore/Modules/mediastream/RTCStatsResponse.h	2013-03-20 18:06:12 UTC (rev 146364)
@@ -49,12 +49,6 @@
 
     virtual size_t addReport(String id, String type, double timestamp) OVERRIDE;
     virtual void addStatistic(size_t report, String name, String value) OVERRIDE;
-    // DEPRECATED
-    virtual size_t addReport() OVERRIDE;
-    // DEPRECATED
-    virtual void addElement(size_t report, bool isLocal, double timestamp) OVERRIDE;
-    // DEPRECATED
-    virtual void addStatistic(size_t report, bool isLocal, String name, String value) OVERRIDE;
 
 private:
     RTCStatsResponse();

Modified: trunk/Source/WebCore/platform/chromium/support/WebRTCStatsResponse.cpp (146363 => 146364)


--- trunk/Source/WebCore/platform/chromium/support/WebRTCStatsResponse.cpp	2013-03-20 17:56:11 UTC (rev 146363)
+++ trunk/Source/WebCore/platform/chromium/support/WebRTCStatsResponse.cpp	2013-03-20 18:06:12 UTC (rev 146364)
@@ -67,24 +67,6 @@
     m_private->addStatistic(report, name, value);
 }
 
-size_t WebRTCStatsResponse::addReport()
-{
-    ASSERT(!m_private.isNull());
-    return m_private->addReport();
-}
-
-void WebRTCStatsResponse::addElement(size_t report, bool isLocal, double timestamp)
-{
-    ASSERT(!m_private.isNull());
-    m_private->addElement(report, isLocal, timestamp);
-}
-
-void WebRTCStatsResponse::addStatistic(size_t report, bool isLocal, WebString name, WebString value)
-{
-    ASSERT(!m_private.isNull());
-    m_private->addStatistic(report, isLocal, name, value);
-}
-
 } // namespace WebKit
 
 #endif // ENABLE(MEDIA_STREAM)

Modified: trunk/Source/WebCore/platform/mediastream/RTCStatsResponseBase.h (146363 => 146364)


--- trunk/Source/WebCore/platform/mediastream/RTCStatsResponseBase.h	2013-03-20 17:56:11 UTC (rev 146363)
+++ trunk/Source/WebCore/platform/mediastream/RTCStatsResponseBase.h	2013-03-20 18:06:12 UTC (rev 146364)
@@ -39,12 +39,6 @@
 
     virtual size_t addReport(String id, String type, double timestamp) = 0;
     virtual void addStatistic(size_t report, String name, String value) = 0;
-    // DEPRECATED - use addReport(id, type, timestamp)
-    virtual size_t addReport() = 0;
-    // DEPRECATED - use addReport(id, type, timestamp)
-    virtual void addElement(size_t report, bool isLocal, double timestamp) = 0;
-    // DEPRECATED - use addStatistic(report, name, value)
-    virtual void addStatistic(size_t report, bool isLocal, String name, String value) = 0;
 };
 
 } // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to