ThreadableWebSocketChannelClientWrapper don't need suspend / resume code.

ThreadableWebSocketChannelClientWrapper don't need suspend / resume code.

As the WebSocket class handles suspend / resume, we can remove the suspend /
resume code from ThreadableWebSocketChannelClientWrapper.

BUG=384238
R=tyoshino

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=176303

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=176401

[tyoshino (SeeGerritForStatus), 2014-06-17 05:31:48]

lgtm

https://codereview.chromium.org/333223002/diff/1/Source/modules/websockets/Th...
File Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
(right):

https://codereview.chromium.org/333223002/diff/1/Source/modules/websockets/Th...
Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:34:
#include "wtf/PassRefPtr.h"
remove?

https://codereview.chromium.org/333223002/diff/1/Source/modules/websockets/Th...
Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:35:
#include "wtf/RefPtr.h"
remove?

https://codereview.chromium.org/333223002/diff/1/Source/modules/websockets/Th...
File Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h
(right):

https://codereview.chromium.org/333223002/diff/1/Source/modules/websockets/Th...
Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h:43: class
WebSocketChannelClient;
this forward declaration was unnecessary?

https://codereview.chromium.org/333223002/diff/1/Source/modules/websockets/Th...
Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h:48:
~ThreadableWebSocketChannelClientWrapper();
use DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED? or we could just remove it as we
now have only m_client?

[yhirano, 2014-06-17 06:04:41]

https://codereview.chromium.org/333223002/diff/1/Source/modules/websockets/Th...
File Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
(right):

https://codereview.chromium.org/333223002/diff/1/Source/modules/websockets/Th...
Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:34:
#include "wtf/PassRefPtr.h"
On 2014/06/17 05:31:48, tyoshino wrote:
> remove?

Done.

https://codereview.chromium.org/333223002/diff/1/Source/modules/websockets/Th...
Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:35:
#include "wtf/RefPtr.h"
On 2014/06/17 05:31:48, tyoshino wrote:
> remove?

Done.

https://codereview.chromium.org/333223002/diff/1/Source/modules/websockets/Th...
File Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h
(right):

https://codereview.chromium.org/333223002/diff/1/Source/modules/websockets/Th...
Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h:43: class
WebSocketChannelClient;
On 2014/06/17 05:31:48, tyoshino wrote:
> this forward declaration was unnecessary?

Done.

https://codereview.chromium.org/333223002/diff/1/Source/modules/websockets/Th...
Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.h:48:
~ThreadableWebSocketChannelClientWrapper();
On 2014/06/17 05:31:48, tyoshino wrote:
> use DECLARE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED? or we could just remove it as we
> now have only m_client?

Done.

[yhirano, 2014-06-17 09:08:29]

The CQ bit was checked by yhirano@chromium.org

[commit-bot: I haz the power, 2014-06-17 09:09:10]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/yhirano@chromium.org/333223002/20001

[commit-bot: I haz the power, 2014-06-17 09:09:17]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-17 09:09:19]

Failed to apply patch for
Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
  Hunk #2 FAILED at 50.
  1 out of 2 hunks FAILED -- saving rejects to file
Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp.rej

Patch:      
Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
Index: Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
diff --git
a/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
b/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
index
9d8b0828f1f7b06485325e38d5fcf5863016b748..e1525d7d8515030b7bfa1bb56b6eceae759c4380
100644
--- a/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
+++ b/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
@@ -31,21 +31,10 @@
 #include "config.h"
 #include "modules/websockets/ThreadableWebSocketChannelClientWrapper.h"
 
-#include "core/dom/CrossThreadTask.h"
-#include "core/dom/ExecutionContext.h"
-#include "platform/CrossThreadCopier.h"
-#include "wtf/PassRefPtr.h"
-#include "wtf/RefPtr.h"
-
 namespace WebCore {
 

ThreadableWebSocketChannelClientWrapper::ThreadableWebSocketChannelClientWrapper(WebSocketChannelClient*
client)
     : m_client(client)
-    , m_suspended(false)
-{
-}
-
-ThreadableWebSocketChannelClientWrapper::~ThreadableWebSocketChannelClientWrapper()
 {
 }
 
@@ -61,121 +50,44 @@ void ThreadableWebSocketChannelClientWrapper::clearClient()
 
 void ThreadableWebSocketChannelClientWrapper::didConnect(const String&
subprotocol, const String& extensions)
 {
-    m_pendingTasks.append(createCallbackTask(&didConnectCallback, this,
subprotocol, extensions));
-    if (!m_suspended)
-        processPendingTasks();
+    if (m_client)
+        m_client->didConnect(subprotocol, extensions);
 }
 
 void ThreadableWebSocketChannelClientWrapper::didReceiveMessage(const String&
message)
 {
-    m_pendingTasks.append(createCallbackTask(&didReceiveMessageCallback, this,
message));
-    if (!m_suspended)
-        processPendingTasks();
+    if (m_client)
+        m_client->didReceiveMessage(message);
 }
 
 void
ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData(PassOwnPtr<Vector<char>
> binaryData)
 {
-    m_pendingTasks.append(createCallbackTask(&didReceiveBinaryDataCallback,
this, binaryData));
-    if (!m_suspended)
-        processPendingTasks();
+    if (m_client)
+        m_client->didReceiveBinaryData(binaryData);
 }
 
 void ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmount(unsigned
long bufferedAmount)
 {
-    m_pendingTasks.append(createCallbackTask(&didUpdateBufferedAmountCallback,
this, bufferedAmount));
-    if (!m_suspended)
-        processPendingTasks();
+    if (m_client)
+        m_client->didUpdateBufferedAmount(bufferedAmount);
 }
 
 void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshake()
 {
-    m_pendingTasks.append(createCallbackTask(&didStartClosingHandshakeCallback,
this));
-    if (!m_suspended)
-        processPendingTasks();
+    if (m_client)
+        m_client->didStartClosingHandshake();
 }
 
 void ThreadableWebSocketChannelClientWrapper::didClose(unsigned long
unhandledBufferedAmount,
WebSocketChannelClient::ClosingHandshakeCompletionStatus
closingHandshakeCompletion, unsigned short code, const String& reason)
 {
-    m_pendingTasks.append(createCallbackTask(&didCloseCallback, this,
unhandledBufferedAmount, closingHandshakeCompletion, code, reason));
-    if (!m_suspended)
-        processPendingTasks();
+    if (m_client)
+        m_client->didClose(unhandledBufferedAmount, closingHandshakeCompletion,
code, reason);
 }
 
 void ThreadableWebSocketChannelClientWrapper::didReceiveMessageError()
 {
-    m_pendingTasks.append(createCallbackTask(&didReceiveMessageErrorCallback,
this));
-    if (!m_suspended)
-        processPendingTasks();
-}
-
-void ThreadableWebSocketChannelClientWrapper::suspend()
-{
-    m_suspended = true;
-}
-
-void ThreadableWebSocketChannelClientWrapper::resume()
-{
-    m_suspended = false;
-    processPendingTasks();
-}
-
-void ThreadableWebSocketChannelClientWrapper::processPendingTasks()
-{
-    if (m_suspended)
-        return;
-    Vector<OwnPtr<ExecutionContextTask> > tasks;
-    tasks.swap(m_pendingTasks);
-    for (Vector<OwnPtr<ExecutionContextTask> >::const_iterator iter =
tasks.begin(); iter != tasks.end(); ++iter)
-        (*iter)->performTask(0);
-}
-
-void
ThreadableWebSocketChannelClientWrapper::didConnectCallback(ExecutionContext*
context, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>
wrapper, const String& subprotocol, const String& extensions)
-{
-    ASSERT_UNUSED(context, !context);
-    if (wrapper->m_client)
-        wrapper->m_client->didConnect(subprotocol, extensions);
-}
-
-void
ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ExecutionContext*
context, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>
wrapper, const String& message)
-{
-    ASSERT_UNUSED(context, !context);
-    if (wrapper->m_client)
-        wrapper->m_client->didReceiveMessage(message);
-}
-
-void
ThreadableWebSocketChannelClientWrapper::didReceiveBinaryDataCallback(ExecutionContext*
context, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>
wrapper, PassOwnPtr<Vector<char> > binaryData)
-{
-    ASSERT_UNUSED(context, !context);
-    if (wrapper->m_client)
-        wrapper->m_client->didReceiveBinaryData(binaryData);
-}
-
-void
ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmountCallback(ExecutionContext*
context, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>
wrapper, unsigned long bufferedAmount)
-{
-    ASSERT_UNUSED(context, !context);
-    if (wrapper->m_client)
-        wrapper->m_client->didUpdateBufferedAmount(bufferedAmount);
-}
-
-void
ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback(ExecutionContext*
context, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>
wrapper)
-{
-    ASSERT_UNUSED(context, !context);
-    if (wrapper->m_client)
-        wrapper->m_client->didStartClosingHandshake();
-}
-
-void
ThreadableWebSocketChannelClientWrapper::didCloseCallback(ExecutionContext*
context, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>
wrapper, unsigned long unhandledBufferedAmount,
WebSocketChannelClient::ClosingHandshakeCompletionStatus
closingHandshakeCompletion, unsigned short code, const String& reason)
-{
-    ASSERT_UNUSED(context, !context);
-    if (wrapper->m_client)
-        wrapper->m_client->didClose(unhandledBufferedAmount,
closingHandshakeCompletion, code, reason);
-}
-
-void
ThreadableWebSocketChannelClientWrapper::didReceiveMessageErrorCallback(ExecutionContext*
context, PassRefPtrWillBeRawPtr<ThreadableWebSocketChannelClientWrapper>
wrapper)
-{
-    ASSERT_UNUSED(context, !context);
-    if (wrapper->m_client)
-        wrapper->m_client->didReceiveMessageError();
+    if (m_client)
+        m_client->didReceiveMessageError();
 }
 
 } // namespace WebCore

[yhirano, 2014-06-17 09:15:40]

The CQ bit was checked by yhirano@chromium.org

[commit-bot: I haz the power, 2014-06-17 09:16:14]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/yhirano@chromium.org/333223002/40001

[commit-bot: I haz the power, 2014-06-17 10:21:41]

Change committed as 176303

[haraken, 2014-06-17 12:52:14]

On 2014/06/17 10:21:41, I haz the power (commit-bot) wrote:
> Change committed as 176303

Reverted this CL in r176310 in order to revert r176298, which broke
browser_tests (WebSocket2):
http://build.chromium.org/p/chromium.webkit/builders/Mac10.8%20Tests/builds/8151

[yhirano, 2014-06-18 02:01:47]

reopen

[yhirano, 2014-06-18 06:06:10]

The CQ bit was checked by yhirano@chromium.org

[commit-bot: I haz the power, 2014-06-18 06:06:49]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/yhirano@chromium.org/333223002/60001

[commit-bot: I haz the power, 2014-06-18 07:56:51]

Change committed as 176401