Changeset 106256 in webkit

Timestamp:

Jan 30, 2012 10:36:18 AM (12 years ago)

Author:

tommyw@google.com

Message:

[chromium] MediaStream API: Fix a few memory leaks
​https://bugs.webkit.org/show_bug.cgi?id=77334

Reviewed by Darin Fisher.

It seems that either the behaviour of WebPrivatePtr has changed or I misunderstood
something, but I fixed a memory leak in WebMediaStreamDescriptor and safeguarded
WebMediaStreamSource.

• public/platform/WebMediaStreamDescriptor.h:

(WebKit::WebMediaStreamDescriptor::WebMediaStreamDescriptor):

• public/platform/WebMediaStreamSource.h:

(WebKit::WebMediaStreamSource::WebMediaStreamSource):
(WebKit::WebMediaStreamSource::operator=):
(WebMediaStreamSource):

• src/WebMediaStreamDescriptor.cpp:

(WebKit::WebMediaStreamDescriptor::assign):

• src/WebMediaStreamSource.cpp:

(WebKit::WebMediaStreamSource::assign):
(WebKit):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/platform/WebMediaStreamDescriptor.h (modified) (1 diff)
• public/platform/WebMediaStreamSource.h (modified) (1 diff)
• src/WebMediaStreamDescriptor.cpp (modified) (1 diff)
• src/WebMediaStreamSource.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-01-30  Tommy Widenflycht  <tommyw@google.com>
+
+        [chromium] MediaStream API: Fix a few memory leaks
+        https://bugs.webkit.org/show_bug.cgi?id=77334
+
+        Reviewed by Darin Fisher.
+
+        It seems that either the behaviour of WebPrivatePtr has changed or I misunderstood
+        something, but I fixed a memory leak in WebMediaStreamDescriptor and safeguarded
+        WebMediaStreamSource.
+
+        * public/platform/WebMediaStreamDescriptor.h:
+        (WebKit::WebMediaStreamDescriptor::WebMediaStreamDescriptor):
+        * public/platform/WebMediaStreamSource.h:
+        (WebKit::WebMediaStreamSource::WebMediaStreamSource):
+        (WebKit::WebMediaStreamSource::operator=):
+        (WebMediaStreamSource):
+        * src/WebMediaStreamDescriptor.cpp:
+        (WebKit::WebMediaStreamDescriptor::assign):
+        * src/WebMediaStreamSource.cpp:
+        (WebKit::WebMediaStreamSource::assign):
+        (WebKit):
+
 2012-01-30  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h

@@ -43 +43 @@
 public:
     WebMediaStreamDescriptor() { }
-    WebMediaStreamDescriptor(const WebMediaStreamDescriptor& request) { assign(request); }
+    WebMediaStreamDescriptor(const WebMediaStreamDescriptor& other) { assign(other); }
     ~WebMediaStreamDescriptor() { reset(); }
 

trunk/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h

@@ -52 +52 @@
 
     WebMediaStreamSource() { }
+    WebMediaStreamSource(const WebMediaStreamSource& other) { assign(other); }
     ~WebMediaStreamSource() { reset(); }
+
+    WebMediaStreamSource& operator=(const WebMediaStreamSource& other)
+    {
+        assign(other);
+        return *this;
+    }
+
+    WEBKIT_EXPORT void assign(const WebMediaStreamSource&);
 
     WEBKIT_EXPORT void initialize(const WebString& id, Type, const WebString& name);

trunk/Source/WebKit/chromium/src/WebMediaStreamDescriptor.cpp

@@ -139 +139 @@
 void WebMediaStreamDescriptor::assign(const WebMediaStreamDescriptor& other)
 {
-    MediaStreamDescriptor* p = other.m_private.get();
-    if (p)
-        p->ref();
-    m_private = p;
+    m_private = other.m_private;
 }
 

trunk/Source/WebKit/chromium/src/WebMediaStreamSource.cpp

@@ -54 +54 @@
 }
 
+void WebMediaStreamSource::assign(const WebMediaStreamSource& other)
+{
+    m_private = other.m_private;
+}
+
 void WebMediaStreamSource::reset()
 {