diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/content/browser/devtools/devtools_io_context.cc | |
parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content/browser/devtools/devtools_io_context.cc')
-rw-r--r-- | chromium/content/browser/devtools/devtools_io_context.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chromium/content/browser/devtools/devtools_io_context.cc b/chromium/content/browser/devtools/devtools_io_context.cc index 74f062b91d1..55f65f8c373 100644 --- a/chromium/content/browser/devtools/devtools_io_context.cc +++ b/chromium/content/browser/devtools/devtools_io_context.cc @@ -22,7 +22,7 @@ using Stream = DevToolsIOContext::Stream; Stream::Stream() : base::RefCountedDeleteOnMessageLoop<Stream>( - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)), + BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)), handle_(base::UintToString(++s_last_stream_handle)), had_errors_(false), last_read_pos_(0) {} @@ -62,9 +62,10 @@ void Stream::Read(off_t position, size_t max_size, ReadCallback callback) { callback)); } -void Stream::Append(const scoped_refptr<base::RefCountedString>& data) { +void Stream::Append(std::unique_ptr<std::string> data) { BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, - base::Bind(&Stream::AppendOnFileThread, this, data)); + base::Bind(&Stream::AppendOnFileThread, this, + base::Passed(std::move(data)))); } void Stream::ReadOnFileThread(off_t position, size_t max_size, @@ -101,14 +102,12 @@ void Stream::ReadOnFileThread(off_t position, size_t max_size, base::Bind(callback, data, status)); } -void Stream::AppendOnFileThread( - const scoped_refptr<base::RefCountedString>& data) { +void Stream::AppendOnFileThread(std::unique_ptr<std::string> data) { DCHECK_CURRENTLY_ON(BrowserThread::FILE); if (!InitOnFileThreadIfNeeded()) return; - const std::string& buffer = data->data(); - int size_written = file_.WriteAtCurrentPos(&*buffer.begin(), buffer.size()); - if (size_written != static_cast<int>(buffer.size())) { + int size_written = file_.WriteAtCurrentPos(data->data(), data->size()); + if (size_written != static_cast<int>(data->size())) { LOG(ERROR) << "Failed to write temporary file"; had_errors_ = true; file_.Close(); |