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

Side by Side Diff: chrome/browser/renderer_host/buffered_resource_handler.cc

Issue 159561: Add CHECKs to the ResourceHandler derived classes to see which is returning a NULL IOBuffer:data_. (Closed)
Patch Set: Add comments. Add missing .h file. Created 11 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_host/buffered_resource_handler.h" 5 #include "chrome/browser/renderer_host/buffered_resource_handler.h"
6 6
7 #include "base/histogram.h" 7 #include "base/histogram.h"
8 #include "base/logging.h"
8 #include "base/string_util.h" 9 #include "base/string_util.h"
9 #include "net/base/mime_sniffer.h" 10 #include "net/base/mime_sniffer.h"
10 #include "net/base/net_errors.h" 11 #include "net/base/net_errors.h"
11 #include "chrome/browser/renderer_host/download_throttling_resource_handler.h" 12 #include "chrome/browser/renderer_host/download_throttling_resource_handler.h"
12 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 13 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
13 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
14 #include "net/base/mime_sniffer.h" 15 #include "net/base/mime_sniffer.h"
15 #include "net/base/io_buffer.h" 16 #include "net/base/io_buffer.h"
16 #include "net/http/http_response_headers.h" 17 #include "net/http/http_response_headers.h"
17 18
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 82
82 // We'll let the original event handler provide a buffer, and reuse it for 83 // We'll let the original event handler provide a buffer, and reuse it for
83 // subsequent reads until we're done buffering. 84 // subsequent reads until we're done buffering.
84 bool BufferedResourceHandler::OnWillRead(int request_id, net::IOBuffer** buf, 85 bool BufferedResourceHandler::OnWillRead(int request_id, net::IOBuffer** buf,
85 int* buf_size, int min_size) { 86 int* buf_size, int min_size) {
86 if (buffering_) { 87 if (buffering_) {
87 DCHECK(!my_buffer_.get()); 88 DCHECK(!my_buffer_.get());
88 my_buffer_ = new net::IOBuffer(kMaxBytesToSniff); 89 my_buffer_ = new net::IOBuffer(kMaxBytesToSniff);
89 *buf = my_buffer_.get(); 90 *buf = my_buffer_.get();
90 *buf_size = kMaxBytesToSniff; 91 *buf_size = kMaxBytesToSniff;
92 // TODO(willchan): Remove after debugging bug 16371.
93 CHECK((*buf)->data());
91 return true; 94 return true;
92 } 95 }
93 96
94 if (finished_) 97 if (finished_)
95 return false; 98 return false;
96 99
97 if (!real_handler_->OnWillRead(request_id, buf, buf_size, min_size)) { 100 if (!real_handler_->OnWillRead(request_id, buf, buf_size, min_size)) {
98 return false; 101 return false;
99 } 102 }
100 read_buffer_ = *buf; 103 read_buffer_ = *buf;
104 // TODO(willchan): Remove after debugging bug 16371.
105 CHECK(read_buffer_->data());
101 read_buffer_size_ = *buf_size; 106 read_buffer_size_ = *buf_size;
102 DCHECK(read_buffer_size_ >= kMaxBytesToSniff * 2); 107 DCHECK(read_buffer_size_ >= kMaxBytesToSniff * 2);
103 bytes_read_ = 0; 108 bytes_read_ = 0;
104 return true; 109 return true;
105 } 110 }
106 111
107 bool BufferedResourceHandler::OnReadCompleted(int request_id, int* bytes_read) { 112 bool BufferedResourceHandler::OnReadCompleted(int request_id, int* bytes_read) {
108 if (sniff_content_ || should_buffer_) { 113 if (sniff_content_ || should_buffer_) {
109 if (KeepBuffering(*bytes_read)) 114 if (KeepBuffering(*bytes_read))
110 return true; 115 return true;
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 real_handler_ = download_handler; 288 real_handler_ = download_handler;
284 } 289 }
285 return real_handler_->OnResponseStarted(request_id, response_); 290 return real_handler_->OnResponseStarted(request_id, response_);
286 } 291 }
287 292
288 bool BufferedResourceHandler::DidBufferEnough(int bytes_read) { 293 bool BufferedResourceHandler::DidBufferEnough(int bytes_read) {
289 const int kRequiredLength = 256; 294 const int kRequiredLength = 256;
290 295
291 return bytes_read >= kRequiredLength; 296 return bytes_read >= kRequiredLength;
292 } 297 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/async_resource_handler.cc ('k') | chrome/browser/renderer_host/cross_site_resource_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698