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

Unified Diff: trunk/Source/platform/network/SocketStreamHandle.cpp

Issue 338243006: Revert 176298 "[WebSocket] bufferedAmount should not decrease in..." (Closed) Base URL: svn://svn.chromium.org/blink/
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: trunk/Source/platform/network/SocketStreamHandle.cpp
===================================================================
--- trunk/Source/platform/network/SocketStreamHandle.cpp (revision 176310)
+++ trunk/Source/platform/network/SocketStreamHandle.cpp (working copy)
@@ -194,6 +194,8 @@
return false;
}
m_buffer.append(data, length);
+ if (m_client)
+ m_client->didUpdateBufferedAmount(this, bufferedAmount());
return true;
}
int bytesWritten = 0;
@@ -201,14 +203,14 @@
bytesWritten = sendInternal(data, length);
if (bytesWritten < 0)
return false;
- if (m_client)
- m_client->didConsumeBufferedAmount(this, bytesWritten);
if (m_buffer.size() + length - bytesWritten > bufferSize) {
// FIXME: report error to indicate that buffer has no more space.
return false;
}
if (bytesWritten < length) {
m_buffer.append(data + bytesWritten, length - bytesWritten);
+ if (m_client)
+ m_client->didUpdateBufferedAmount(this, bufferedAmount());
}
return true;
}
@@ -257,9 +259,9 @@
return false;
ASSERT(m_buffer.size() - bytesWritten <= bufferSize);
m_buffer.consume(bytesWritten);
- if (m_client)
- m_client->didConsumeBufferedAmount(this, bytesWritten);
} while (!pending && !m_buffer.isEmpty());
+ if (m_client)
+ m_client->didUpdateBufferedAmount(this, bufferedAmount());
return true;
}
« no previous file with comments | « trunk/Source/platform/network/SocketStreamHandle.h ('k') | trunk/Source/platform/network/SocketStreamHandleClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698