Account for HTTP/2 padding in receive windows.

net/spdy/spdy_session.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_session.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 2037 matching lines @@
   stream->IncrementRawReceivedBytes(header_len);
 }
 
 void SpdySession::OnStreamFrameData(SpdyStreamId stream_id,
                                     const char* data,
                                     size_t len,
                                     bool fin) {
   CHECK(in_io_loop_);
 
   if (data == NULL && len != 0) {
-    // This is notification of consumed data padding.
-    // TODO(jgraettinger): Properly flow padding into WINDOW_UPDATE frames.
-    // See crbug.com/353012.
+    if (flow_control_state_ != FLOW_CONTROL_STREAM_AND_SESSION)
+      return;
+
+    // Decrease window size because padding bytes are received.
+    // Increase window size because padding bytes are consumed (by discarding).
+    // Net result: |session_unacked_recv_window_bytes_| increases by |len|,
+    // |session_recv_window_size_| does not change.
+    DecreaseRecvWindowSize(static_cast<int32>(len));
+    IncreaseRecvWindowSize(static_cast<int32>(len));
+
+    ActiveStreamMap::iterator it = active_streams_.find(stream_id);
+    if (it == active_streams_.end())
+      return;
+    it->second.stream->OnPaddingConsumed(len);
     return;
   }
 
   DCHECK_LT(len, 1u << 24);
   if (net_log().IsLogging()) {
     net_log().AddEvent(
         NetLog::TYPE_SPDY_SESSION_RECV_DATA,
         base::Bind(&NetLogSpdyDataCallback, stream_id, len, fin));
   }
 
@@ skipping 1214 matching lines @@
     if (!queue->empty()) {
       SpdyStreamId stream_id = queue->front();
       queue->pop_front();
       return stream_id;
     }
   }
   return 0;
 }
 
 }  // namespace net