Changeset 61385 in webkit

Timestamp:

Jun 18, 2010 1:28:00 AM (14 years ago)

Author:

ukai@chromium.org

Message:

Unreviewed test breakage fix.

WebSocket: resume should not process buffer if already processing.
​https://bugs.webkit.org/show_bug.cgi?id=39340

MessageLoop runs in main thread, so we don't need to use timer in worker thread.
Also, we should not use Timer in worker thread.

• websockets/ThreadableWebSocketChannelClientWrapper.h:

(WebCore::ThreadableWebSocketChannelClientWrapper::resume):
(WebCore::ThreadableWebSocketChannelClientWrapper::ThreadableWebSocketChannelClientWrapper):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• websockets/ThreadableWebSocketChannelClientWrapper.h (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-18  Fumitoshi Ukai  <ukai@chromium.org>
+
+        Unreviewed test breakage fix.
+
+        WebSocket: resume should not process buffer if already processing.
+        https://bugs.webkit.org/show_bug.cgi?id=39340
+
+        MessageLoop runs in main thread, so we don't need to use timer in worker thread.
+        Also, we should not use Timer in worker thread.
+
+        * websockets/ThreadableWebSocketChannelClientWrapper.h:
+        (WebCore::ThreadableWebSocketChannelClientWrapper::resume):
+        (WebCore::ThreadableWebSocketChannelClientWrapper::ThreadableWebSocketChannelClientWrapper):
+
 2010-06-17  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h

@@ -35 +35 @@
 
 #include "PlatformString.h"
-#include "Timer.h"
 #include "WebSocketChannelClient.h"
 #include <wtf/PassRefPtr.h>
@@ -121 +120 @@
     {
         m_suspended = false;
-        if ((m_pendingConnected || !m_pendingMessages.isEmpty() || m_pendingClosed) && !m_resumeTimer.isActive())
-            m_resumeTimer.startOneShot(0);
+        processPendingEvents();
     }
 
@@ -134 +132 @@
         , m_pendingConnected(false)
         , m_pendingClosed(false)
-        , m_resumeTimer(this, &ThreadableWebSocketChannelClientWrapper::resumeTimerFired)
     {
     }
@@ -161 +158 @@
     }
 
-    void resumeTimerFired(Timer<ThreadableWebSocketChannelClientWrapper>* timer)
-    {
-        ASSERT_UNUSED(timer, timer == &m_resumeTimer);
-        processPendingEvents();
-    }
-
     WebSocketChannelClient* m_client;
     bool m_syncMethodDone;
@@ -175 +166 @@
     Vector<String> m_pendingMessages;
     bool m_pendingClosed;
-    Timer<ThreadableWebSocketChannelClientWrapper> m_resumeTimer;
 };