Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2191)

Unified Diff: Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp

Issue 311993006: [WebSocket] bufferedAmount should not decrease inside a task. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
diff --git a/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp b/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
index e7e303d0bebcfc90ec4907304da7d4c781597754..d1145276ecd0f019399b1d9397c9118db05bb44e 100644
--- a/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
+++ b/Source/modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
@@ -102,9 +102,16 @@ void ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData(PassOwnPtr<Ve
processPendingTasks();
}
-void ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmount(unsigned long bufferedAmount)
+void ThreadableWebSocketChannelClientWrapper::didIncreaseBufferedAmount(unsigned long amount)
{
- m_pendingTasks.append(createCallbackTask(&didUpdateBufferedAmountCallback, this, bufferedAmount));
+ m_pendingTasks.append(createCallbackTask(&didIncreaseBufferedAmountCallback, this, amount));
+ if (!m_suspended)
+ processPendingTasks();
+}
tyoshino (SeeGerritForStatus) 2014/06/09 09:24:26 blank line here
yhirano 2014/06/09 11:59:51 Done.
+void ThreadableWebSocketChannelClientWrapper::didDecreaseBufferedAmount(unsigned long amount)
+
tyoshino (SeeGerritForStatus) 2014/06/09 09:24:26 remove this blank line
yhirano 2014/06/09 11:59:51 Done.
+{
+ m_pendingTasks.append(createCallbackTask(&didDecreaseBufferedAmountCallback, this, amount));
if (!m_suspended)
processPendingTasks();
}
@@ -172,13 +179,21 @@ void ThreadableWebSocketChannelClientWrapper::didReceiveBinaryDataCallback(Execu
wrapper->m_client->didReceiveBinaryData(binaryData);
}
-void ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmountCallback(ExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long bufferedAmount)
+void ThreadableWebSocketChannelClientWrapper::didIncreaseBufferedAmountCallback(ExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long amount)
{
ASSERT_UNUSED(context, !context);
if (wrapper->m_client)
- wrapper->m_client->didUpdateBufferedAmount(bufferedAmount);
+ wrapper->m_client->didIncreaseBufferedAmount(amount);
}
+void ThreadableWebSocketChannelClientWrapper::didDecreaseBufferedAmountCallback(ExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long amount)
+{
+ ASSERT_UNUSED(context, !context);
+ if (wrapper->m_client)
+ wrapper->m_client->didDecreaseBufferedAmount(amount);
+}
+
+
tyoshino (SeeGerritForStatus) 2014/06/09 09:24:26 one blank line
yhirano 2014/06/09 11:59:51 Done.
void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback(ExecutionContext* context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
{
ASSERT_UNUSED(context, !context);

Powered by Google App Engine
This is Rietveld 408576698