Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1112)

Unified Diff: webkit/appcache/appcache_response.cc

Issue 16155009: Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/appcache/appcache_request_handler_unittest.cc ('k') | webkit/appcache/appcache_response_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/appcache/appcache_response.cc
diff --git a/webkit/appcache/appcache_response.cc b/webkit/appcache/appcache_response.cc
index ddd639c469751e7dc19ba175934bed8d2e9404d5..a331b6ae81beb0dbec1b799f16d90a9cafccf238 100644
--- a/webkit/appcache/appcache_response.cc
+++ b/webkit/appcache/appcache_response.cc
@@ -204,8 +204,10 @@ void AppCacheResponseReader::ContinueReadData() {
DCHECK(range_length_ >= read_position_);
buffer_len_ = range_length_ - read_position_;
}
- ReadRaw(kResponseContentIndex, range_offset_ + read_position_,
- buffer_, buffer_len_);
+ ReadRaw(kResponseContentIndex,
+ range_offset_ + read_position_,
+ buffer_.get(),
+ buffer_len_);
}
void AppCacheResponseReader::SetReadRange(int offset, int length) {
@@ -216,13 +218,13 @@ void AppCacheResponseReader::SetReadRange(int offset, int length) {
void AppCacheResponseReader::OnIOComplete(int result) {
if (result >= 0) {
- if (info_buffer_) {
+ if (info_buffer_.get()) {
// Deserialize the http info structure, ensuring we got headers.
Pickle pickle(buffer_->data(), result);
scoped_ptr<net::HttpResponseInfo> info(new net::HttpResponseInfo);
bool response_truncated = false;
if (!info->InitFromPickle(pickle, &response_truncated) ||
- !info->headers) {
+ !info->headers.get()) {
InvokeUserCompletionCallback(net::ERR_FAILED);
return;
}
@@ -271,7 +273,7 @@ void AppCacheResponseReader::OnOpenEntryComplete(
open_callback_.Reset();
}
- if (info_buffer_)
+ if (info_buffer_.get())
ContinueReadInfo();
else
ContinueReadData();
@@ -301,7 +303,7 @@ void AppCacheResponseWriter::WriteInfo(
DCHECK(info_buf->http_info.get());
DCHECK(!buffer_.get());
DCHECK(!info_buffer_.get());
- DCHECK(info_buf->http_info->headers);
+ DCHECK(info_buf->http_info->headers.get());
info_buffer_ = info_buf;
callback_ = callback; // cleared on completion
@@ -320,7 +322,7 @@ void AppCacheResponseWriter::ContinueWriteInfo() {
info_buffer_->http_info->Persist(pickle, kSkipTransientHeaders, kTruncated);
write_amount_ = static_cast<int>(pickle->size());
buffer_ = new WrappedPickleIOBuffer(pickle); // takes ownership of pickle
- WriteRaw(kResponseInfoIndex, 0, buffer_, write_amount_);
+ WriteRaw(kResponseInfoIndex, 0, buffer_.get(), write_amount_);
}
void AppCacheResponseWriter::WriteData(
@@ -343,13 +345,14 @@ void AppCacheResponseWriter::ContinueWriteData() {
ScheduleIOCompletionCallback(net::ERR_FAILED);
return;
}
- WriteRaw(kResponseContentIndex, write_position_, buffer_, write_amount_);
+ WriteRaw(
+ kResponseContentIndex, write_position_, buffer_.get(), write_amount_);
}
void AppCacheResponseWriter::OnIOComplete(int result) {
if (result >= 0) {
DCHECK(write_amount_ == result);
- if (!info_buffer_)
+ if (!info_buffer_.get())
write_position_ += result;
else
info_size_ = result;
@@ -411,7 +414,7 @@ void AppCacheResponseWriter::OnCreateEntryComplete(
create_callback_.Reset();
}
- if (info_buffer_)
+ if (info_buffer_.get())
ContinueWriteInfo();
else
ContinueWriteData();
« no previous file with comments | « webkit/appcache/appcache_request_handler_unittest.cc ('k') | webkit/appcache/appcache_response_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698