projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
net
/
http
/
http_stream_parser.cc
diff --git
a/src/net/http/http_stream_parser.cc
b/src/net/http/http_stream_parser.cc
index
86b188b
..
b998986
100644
(file)
--- a/
src/net/http/http_stream_parser.cc
+++ b/
src/net/http/http_stream_parser.cc
@@
-7,6
+7,7
@@
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
+#include "base/profiler/scoped_tracker.h"
#include "base/strings/string_util.h"
#include "base/values.h"
#include "net/base/io_buffer.h"
#include "base/strings/string_util.h"
#include "base/values.h"
#include "net/base/io_buffer.h"
@@
-161,7
+162,7
@@
class HttpStreamParser::SeekableIOBuffer : public IOBuffer {
int capacity() const { return capacity_; };
private:
int capacity() const { return capacity_; };
private:
-
virtual ~SeekableIOBuffer()
{
+
~SeekableIOBuffer() override
{
// data_ will be deleted in IOBuffer::~IOBuffer().
data_ = real_data_;
}
// data_ will be deleted in IOBuffer::~IOBuffer().
data_ = real_data_;
}
@@
-357,11
+358,21
@@
int HttpStreamParser::ReadResponseBody(IOBuffer* buf, int buf_len,
}
void HttpStreamParser::OnIOComplete(int result) {
}
void HttpStreamParser::OnIOComplete(int result) {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/418183 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "418183 DidCompleteReadWrite => HttpStreamParser::OnIOComplete"));
+
result = DoLoop(result);
// The client callback can do anything, including destroying this class,
// so any pending callback must be issued after everything else is done.
if (result != ERR_IO_PENDING && !callback_.is_null()) {
result = DoLoop(result);
// The client callback can do anything, including destroying this class,
// so any pending callback must be issued after everything else is done.
if (result != ERR_IO_PENDING && !callback_.is_null()) {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/424359 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION(
+ "424359 HttpStreamParser::OnIOComplete callback"));
+
CompletionCallback c = callback_;
callback_.Reset();
c.Run(result);
CompletionCallback c = callback_;
callback_.Reset();
c.Run(result);
@@
-369,6
+380,10
@@
void HttpStreamParser::OnIOComplete(int result) {
}
int HttpStreamParser::DoLoop(int result) {
}
int HttpStreamParser::DoLoop(int result) {
+ // TODO(vadimt): Remove ScopedTracker below once crbug.com/424359 is fixed.
+ tracked_objects::ScopedTracker tracking_profile(
+ FROM_HERE_WITH_EXPLICIT_FUNCTION("424359 HttpStreamParser::DoLoop"));
+
do {
DCHECK_NE(ERR_IO_PENDING, result);
DCHECK_NE(STATE_DONE, io_state_);
do {
DCHECK_NE(ERR_IO_PENDING, result);
DCHECK_NE(STATE_DONE, io_state_);