Revert 176298 "[WebSocket] bufferedAmount should not decrease in..."

trunk/Source/platform/network/SocketStreamHandle.cpp

 /*
  * Copyright (C) 2009, 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 176 matching lines @@
 bool SocketStreamHandle::send(const char* data, int length)
 {
     if (m_state == Connecting || m_state == Closing)
         return false;
     if (!m_buffer.isEmpty()) {
         if (m_buffer.size() + length > bufferSize) {
             // FIXME: report error to indicate that buffer has no more space.
             return false;
         }
         m_buffer.append(data, length);
+        if (m_client)
+            m_client->didUpdateBufferedAmount(this, bufferedAmount());
         return true;
     }
     int bytesWritten = 0;
     if (m_state == Open)
         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;
 }
 
 void SocketStreamHandle::close()
 {
     if (m_state == Closed)
         return;
     m_state = Closing;
     if (!m_buffer.isEmpty())
@@ skipping 28 matching lines @@
         }
     }
     bool pending;
     do {
         int bytesWritten = sendInternal(m_buffer.firstBlockData(), m_buffer.firstBlockSize());
         pending = bytesWritten != static_cast<int>(m_buffer.firstBlockSize());
         if (bytesWritten <= 0)
             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;
 }
 
 int SocketStreamHandle::sendInternal(const char* buf, int len)
 {
     if (!m_internal)
         return 0;
     return m_internal->send(buf, len);
 }
 
 void SocketStreamHandle::closeInternal()
 {
     if (m_internal)
         m_internal->close();
 }
 
 } // namespace WebCore