Changeset 57646 in webkit

Timestamp:

Apr 15, 2010 7:52:10 AM (14 years ago)

Author:

hamaji@chromium.org

Message:

2010-04-15 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by David Levin.

LEAK: in ThreadableWebSocketChannel::create()
​https://bugs.webkit.org/show_bug.cgi?id=37584

No new tests because this change just fixes a leak.

• websockets/WorkerThreadableWebSocketChannel.cpp: (WebCore::WorkerThreadableWebSocketChannel::WorkerThreadableWebSocketChannel):
• websockets/WorkerThreadableWebSocketChannel.h: (WebCore::WorkerThreadableWebSocketChannel::Bridge::create):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• websockets/WorkerThreadableWebSocketChannel.cpp (modified) (1 diff)
• websockets/WorkerThreadableWebSocketChannel.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-15  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by David Levin.
+
+        LEAK: in ThreadableWebSocketChannel::create()
+        https://bugs.webkit.org/show_bug.cgi?id=37584
+
+        No new tests because this change just fixes a leak.
+
+        * websockets/WorkerThreadableWebSocketChannel.cpp:
+        (WebCore::WorkerThreadableWebSocketChannel::WorkerThreadableWebSocketChannel):
+        * websockets/WorkerThreadableWebSocketChannel.h:
+        (WebCore::WorkerThreadableWebSocketChannel::Bridge::create):
+
 2010-04-15  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp

@@ -53 +53 @@
     : m_workerContext(context)
     , m_workerClientWrapper(ThreadableWebSocketChannelClientWrapper::create(client))
-    , m_bridge(new Bridge(m_workerClientWrapper, m_workerContext, taskMode, url, protocol))
+    , m_bridge(Bridge::create(m_workerClientWrapper, m_workerContext, taskMode, url, protocol))
 {
 }

trunk/WebCore/websockets/WorkerThreadableWebSocketChannel.h

@@ -106 +106 @@
     class Bridge : public RefCounted<Bridge> {
     public:
-        Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassRefPtr<WorkerContext>, const String& taskMode, const KURL&, const String& protocol);
+        static PassRefPtr<Bridge> create(PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassRefPtr<WorkerContext> workerContext, const String& taskMode, const KURL& url, const String& protocol)
+        {
+            return adoptRef(new Bridge(workerClientWrapper, workerContext, taskMode, url, protocol));
+        }
         ~Bridge();
         void connect();
@@ -118 +121 @@
 
     private:
+        Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassRefPtr<WorkerContext>, const String& taskMode, const KURL&, const String& protocol);
+
         static void setWebSocketChannel(ScriptExecutionContext*, Bridge* thisPtr, Peer*, RefPtr<ThreadableWebSocketChannelClientWrapper>);