net/spdy/spdy_stream.cc - Issue 935333002: Update from https://crrev.com/316786

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/spdy/spdy_stream.cc

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 10 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:

Index: net/spdy/spdy_stream.cc

diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc

index e7dcd5b95d5e2aa82c5e47a0cb50058e98ec514a..1059223085b70f46f81d5267b48dfc18f4fc1618 100644

--- a/net/spdy/spdy_stream.cc

+++ b/net/spdy/spdy_stream.cc

@@ -8,6 +8,7 @@

#include "base/compiler_specific.h"

#include "base/logging.h"

#include "base/message_loop/message_loop.h"

+#include "base/profiler/scoped_tracker.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/stringprintf.h"

#include "base/values.h"

@@ -528,6 +529,10 @@ void SpdyStream::OnDataReceived(scoped_ptr<SpdyBuffer> buffer) {

void SpdyStream::OnFrameWriteComplete(SpdyFrameType frame_type,

size_t frame_size) {

+ // TODO(pkasting): Remove ScopedTracker below once crbug.com/457517 is fixed.

+ tracked_objects::ScopedTracker tracking_profile(

+ FROM_HERE_WITH_EXPLICIT_FUNCTION(

+ "457517 SpdyStream::OnFrameWriteComplete"));

DCHECK_NE(type_, SPDY_PUSH_STREAM);

if (frame_size < session_->GetFrameMinimumSize() ||

« no previous file with comments | « net/spdy/spdy_session_pool.cc ('k') | net/ssl/openssl_ssl_util.cc » ('j') | no next file with comments »