OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "net/filter/sdch_filter.h" | 5 #include "net/filter/sdch_filter.h" |
6 | 6 |
7 #include <ctype.h> | 7 #include <ctype.h> |
8 #include <limits.h> | 8 #include <limits.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
43 | 43 |
44 static int filter_use_count = 0; | 44 static int filter_use_count = 0; |
45 ++filter_use_count; | 45 ++filter_use_count; |
46 if (META_REFRESH_RECOVERY == decoding_status_) { | 46 if (META_REFRESH_RECOVERY == decoding_status_) { |
47 UMA_HISTOGRAM_COUNTS("Sdch3.FilterUseBeforeDisabling", filter_use_count); | 47 UMA_HISTOGRAM_COUNTS("Sdch3.FilterUseBeforeDisabling", filter_use_count); |
48 } | 48 } |
49 | 49 |
50 if (vcdiff_streaming_decoder_.get()) { | 50 if (vcdiff_streaming_decoder_.get()) { |
51 if (!vcdiff_streaming_decoder_->FinishDecoding()) { | 51 if (!vcdiff_streaming_decoder_->FinishDecoding()) { |
52 decoding_status_ = DECODING_ERROR; | 52 decoding_status_ = DECODING_ERROR; |
53 SdchManager::SdchErrorRecovery(SdchManager::INCOMPLETE_SDCH_CONTENT); | 53 GetSdchManager()->SdchErrorRecovery( |
| 54 SdchManager::INCOMPLETE_SDCH_CONTENT, url_); |
54 // Make it possible for the user to hit reload, and get non-sdch content. | 55 // Make it possible for the user to hit reload, and get non-sdch content. |
55 // Note this will "wear off" quickly enough, and is just meant to assure | 56 // Note this will "wear off" quickly enough, and is just meant to assure |
56 // in some rare case that the user is not stuck. | 57 // in some rare case that the user is not stuck. |
57 url_request_context_->sdch_manager()->BlacklistDomain( | 58 url_request_context_->sdch_manager()->BlacklistDomain( |
58 url_); | 59 url_); |
59 UMA_HISTOGRAM_COUNTS("Sdch3.PartialBytesIn", | 60 UMA_HISTOGRAM_COUNTS("Sdch3.PartialBytesIn", |
60 static_cast<int>(filter_context_.GetByteReadCount())); | 61 static_cast<int>(filter_context_.GetByteReadCount())); |
61 UMA_HISTOGRAM_COUNTS("Sdch3.PartialVcdiffIn", source_bytes_); | 62 UMA_HISTOGRAM_COUNTS("Sdch3.PartialVcdiffIn", source_bytes_); |
62 UMA_HISTOGRAM_COUNTS("Sdch3.PartialVcdiffOut", output_bytes_); | 63 UMA_HISTOGRAM_COUNTS("Sdch3.PartialVcdiffOut", output_bytes_); |
63 } | 64 } |
64 } | 65 } |
65 | 66 |
66 if (!dest_buffer_excess_.empty()) { | 67 if (!dest_buffer_excess_.empty()) { |
67 // Filter chaining error, or premature teardown. | 68 // Filter chaining error, or premature teardown. |
68 SdchManager::SdchErrorRecovery(SdchManager::UNFLUSHED_CONTENT); | 69 GetSdchManager()->SdchErrorRecovery(SdchManager::UNFLUSHED_CONTENT, url_); |
69 UMA_HISTOGRAM_COUNTS("Sdch3.UnflushedBytesIn", | 70 UMA_HISTOGRAM_COUNTS("Sdch3.UnflushedBytesIn", |
70 static_cast<int>(filter_context_.GetByteReadCount())); | 71 static_cast<int>(filter_context_.GetByteReadCount())); |
71 UMA_HISTOGRAM_COUNTS("Sdch3.UnflushedBufferSize", | 72 UMA_HISTOGRAM_COUNTS("Sdch3.UnflushedBufferSize", |
72 dest_buffer_excess_.size()); | 73 dest_buffer_excess_.size()); |
73 UMA_HISTOGRAM_COUNTS("Sdch3.UnflushedVcdiffIn", source_bytes_); | 74 UMA_HISTOGRAM_COUNTS("Sdch3.UnflushedVcdiffIn", source_bytes_); |
74 UMA_HISTOGRAM_COUNTS("Sdch3.UnflushedVcdiffOut", output_bytes_); | 75 UMA_HISTOGRAM_COUNTS("Sdch3.UnflushedVcdiffOut", output_bytes_); |
75 } | 76 } |
76 | 77 |
77 if (filter_context_.IsCachedContent()) { | 78 if (filter_context_.IsCachedContent()) { |
78 // Not a real error, but it is useful to have this tally. | 79 // Not a real error, but it is useful to have this tally. |
79 // TODO(jar): Remove this stat after SDCH stability is validated. | 80 // TODO(jar): Remove this stat after SDCH stability is validated. |
80 SdchManager::SdchErrorRecovery(SdchManager::CACHE_DECODED); | 81 GetSdchManager()->SdchErrorRecovery(SdchManager::CACHE_DECODED, url_); |
81 return; // We don't need timing stats, and we aready got ratios. | 82 return; // We don't need timing stats, and we aready got ratios. |
82 } | 83 } |
83 | 84 |
84 switch (decoding_status_) { | 85 switch (decoding_status_) { |
85 case DECODING_IN_PROGRESS: { | 86 case DECODING_IN_PROGRESS: { |
86 if (output_bytes_) | 87 if (output_bytes_) |
87 UMA_HISTOGRAM_PERCENTAGE("Sdch3.Network_Decode_Ratio_a", | 88 UMA_HISTOGRAM_PERCENTAGE("Sdch3.Network_Decode_Ratio_a", |
88 static_cast<int>( | 89 static_cast<int>( |
89 (filter_context_.GetByteReadCount() * 100) / output_bytes_)); | 90 (filter_context_.GetByteReadCount() * 100) / output_bytes_)); |
90 UMA_HISTOGRAM_COUNTS("Sdch3.Network_Decode_Bytes_VcdiffOut_a", | 91 UMA_HISTOGRAM_COUNTS("Sdch3.Network_Decode_Bytes_VcdiffOut_a", |
91 output_bytes_); | 92 output_bytes_); |
92 filter_context_.RecordPacketStats(FilterContext::SDCH_DECODE); | 93 filter_context_.RecordPacketStats(FilterContext::SDCH_DECODE); |
93 | 94 |
94 // Allow latency experiments to proceed. | 95 // Allow latency experiments to proceed. |
95 url_request_context_->sdch_manager()->SetAllowLatencyExperiment( | 96 GetSdchManager()->SetAllowLatencyExperiment(url_, true); |
96 url_, true); | |
97 return; | 97 return; |
98 } | 98 } |
99 case PASS_THROUGH: { | 99 case PASS_THROUGH: { |
100 filter_context_.RecordPacketStats(FilterContext::SDCH_PASSTHROUGH); | 100 filter_context_.RecordPacketStats(FilterContext::SDCH_PASSTHROUGH); |
101 return; | 101 return; |
102 } | 102 } |
103 case DECODING_UNINITIALIZED: { | 103 case DECODING_UNINITIALIZED: { |
104 SdchManager::SdchErrorRecovery(SdchManager::UNINITIALIZED); | 104 GetSdchManager()->SdchErrorRecovery(SdchManager::UNINITIALIZED, url_); |
105 return; | 105 return; |
106 } | 106 } |
107 case WAITING_FOR_DICTIONARY_SELECTION: { | 107 case WAITING_FOR_DICTIONARY_SELECTION: { |
108 SdchManager::SdchErrorRecovery(SdchManager::PRIOR_TO_DICTIONARY); | 108 GetSdchManager()->SdchErrorRecovery( |
| 109 SdchManager::PRIOR_TO_DICTIONARY, url_); |
109 return; | 110 return; |
110 } | 111 } |
111 case DECODING_ERROR: { | 112 case DECODING_ERROR: { |
112 SdchManager::SdchErrorRecovery(SdchManager::DECODE_ERROR); | 113 GetSdchManager()->SdchErrorRecovery(SdchManager::DECODE_ERROR, url_); |
113 return; | 114 return; |
114 } | 115 } |
115 case META_REFRESH_RECOVERY: { | 116 case META_REFRESH_RECOVERY: { |
116 // Already accounted for when set. | 117 // Already accounted for when set. |
117 return; | 118 return; |
118 } | 119 } |
119 } // end of switch. | 120 } // end of switch. |
120 } | 121 } |
121 | 122 |
122 bool SdchFilter::InitDecoding(Filter::FilterType filter_type) { | 123 bool SdchFilter::InitDecoding(Filter::FilterType filter_type) { |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 // we may even issue a "meta-refresh" to reload the page without an SDCH | 169 // we may even issue a "meta-refresh" to reload the page without an SDCH |
169 // advertisement (so that we are sure we're not hurting anything). | 170 // advertisement (so that we are sure we're not hurting anything). |
170 // | 171 // |
171 // Watch out for an error page inserted by the proxy as part of a 40x | 172 // Watch out for an error page inserted by the proxy as part of a 40x |
172 // error response. When we see such content molestation, we certainly | 173 // error response. When we see such content molestation, we certainly |
173 // need to fall into the meta-refresh case. | 174 // need to fall into the meta-refresh case. |
174 if (filter_context_.GetResponseCode() == 404) { | 175 if (filter_context_.GetResponseCode() == 404) { |
175 // We could be more generous, but for now, only a "NOT FOUND" code will | 176 // We could be more generous, but for now, only a "NOT FOUND" code will |
176 // cause a pass through. All other bad codes will fall into a | 177 // cause a pass through. All other bad codes will fall into a |
177 // meta-refresh. | 178 // meta-refresh. |
178 SdchManager::SdchErrorRecovery(SdchManager::PASS_THROUGH_404_CODE); | 179 GetSdchManager()->SdchErrorRecovery( |
| 180 SdchManager::PASS_THROUGH_404_CODE, url_); |
179 decoding_status_ = PASS_THROUGH; | 181 decoding_status_ = PASS_THROUGH; |
180 } else if (filter_context_.GetResponseCode() != 200) { | 182 } else if (filter_context_.GetResponseCode() != 200) { |
181 // We need to meta-refresh, with SDCH disabled. | 183 // We need to meta-refresh, with SDCH disabled. |
182 } else if (filter_context_.IsCachedContent() | 184 } else if (filter_context_.IsCachedContent() |
183 && !dictionary_hash_is_plausible_) { | 185 && !dictionary_hash_is_plausible_) { |
184 // We must have hit the back button, and gotten content that was fetched | 186 // We must have hit the back button, and gotten content that was fetched |
185 // before we *really* advertised SDCH and a dictionary. | 187 // before we *really* advertised SDCH and a dictionary. |
186 SdchManager::SdchErrorRecovery(SdchManager::PASS_THROUGH_OLD_CACHED); | 188 GetSdchManager()->SdchErrorRecovery( |
| 189 SdchManager::PASS_THROUGH_OLD_CACHED, url_); |
187 decoding_status_ = PASS_THROUGH; | 190 decoding_status_ = PASS_THROUGH; |
188 } else if (possible_pass_through_) { | 191 } else if (possible_pass_through_) { |
189 // This is the potentially most graceful response. There really was no | 192 // This is the potentially most graceful response. There really was no |
190 // error. We were just overly cautious when we added a TENTATIVE_SDCH. | 193 // error. We were just overly cautious when we added a TENTATIVE_SDCH. |
191 // We added the sdch coding tag, and it should not have been added. | 194 // We added the sdch coding tag, and it should not have been added. |
192 // This can happen in server experiments, where the server decides | 195 // This can happen in server experiments, where the server decides |
193 // not to use sdch, even though there is a dictionary. To be | 196 // not to use sdch, even though there is a dictionary. To be |
194 // conservative, we locally added the tentative sdch (fearing that a | 197 // conservative, we locally added the tentative sdch (fearing that a |
195 // proxy stripped it!) and we must now recant (pass through). | 198 // proxy stripped it!) and we must now recant (pass through). |
196 SdchManager::SdchErrorRecovery(SdchManager::DISCARD_TENTATIVE_SDCH); | 199 GetSdchManager()->SdchErrorRecovery( |
| 200 SdchManager::DISCARD_TENTATIVE_SDCH, url_); |
197 // However.... just to be sure we don't get burned by proxies that | 201 // However.... just to be sure we don't get burned by proxies that |
198 // re-compress with gzip or other system, we can sniff to see if this | 202 // re-compress with gzip or other system, we can sniff to see if this |
199 // is compressed data etc. For now, we do nothing, which gets us into | 203 // is compressed data etc. For now, we do nothing, which gets us into |
200 // the meta-refresh result. | 204 // the meta-refresh result. |
201 // TODO(jar): Improve robustness by sniffing for valid text that we can | 205 // TODO(jar): Improve robustness by sniffing for valid text that we can |
202 // actual use re: decoding_status_ = PASS_THROUGH; | 206 // actual use re: decoding_status_ = PASS_THROUGH; |
203 } else if (dictionary_hash_is_plausible_) { | 207 } else if (dictionary_hash_is_plausible_) { |
204 // We need a meta-refresh since we don't have the dictionary. | 208 // We need a meta-refresh since we don't have the dictionary. |
205 // The common cause is a restart of the browser, where we try to render | 209 // The common cause is a restart of the browser, where we try to render |
206 // cached content that was saved when we had a dictionary. | 210 // cached content that was saved when we had a dictionary. |
207 } else if (filter_context_.IsSdchResponse()) { | 211 } else if (filter_context_.IsSdchResponse()) { |
208 // This is a very corrupt SDCH request response. We can't decode it. | 212 // This is a very corrupt SDCH request response. We can't decode it. |
209 // We'll use a meta-refresh, and get content without asking for SDCH. | 213 // We'll use a meta-refresh, and get content without asking for SDCH. |
210 // This will also progressively disable SDCH for this domain. | 214 // This will also progressively disable SDCH for this domain. |
211 } else { | 215 } else { |
212 // One of the first 9 bytes precluded consideration as a hash. | 216 // One of the first 9 bytes precluded consideration as a hash. |
213 // This can't be an SDCH payload, even though the server said it was. | 217 // This can't be an SDCH payload, even though the server said it was. |
214 // This is a major error, as the server or proxy tagged this SDCH even | 218 // This is a major error, as the server or proxy tagged this SDCH even |
215 // though it is not! | 219 // though it is not! |
216 // Meta-refresh won't help, as we didn't advertise an SDCH dictionary!! | 220 // Meta-refresh won't help, as we didn't advertise an SDCH dictionary!! |
217 // Worse yet, meta-refresh could lead to an infinite refresh loop. | 221 // Worse yet, meta-refresh could lead to an infinite refresh loop. |
218 SdchManager::SdchErrorRecovery(SdchManager::PASSING_THROUGH_NON_SDCH); | 222 GetSdchManager()->SdchErrorRecovery( |
| 223 SdchManager::PASSING_THROUGH_NON_SDCH, url_); |
219 decoding_status_ = PASS_THROUGH; | 224 decoding_status_ = PASS_THROUGH; |
220 // ... but further back-off on advertising SDCH support. | 225 // ... but further back-off on advertising SDCH support. |
221 url_request_context_->sdch_manager()->BlacklistDomain(url_); | 226 url_request_context_->sdch_manager()->BlacklistDomain(url_); |
222 } | 227 } |
223 | 228 |
224 if (decoding_status_ == PASS_THROUGH) { | 229 if (decoding_status_ == PASS_THROUGH) { |
225 dest_buffer_excess_ = dictionary_hash_; // Send what we scanned. | 230 dest_buffer_excess_ = dictionary_hash_; // Send what we scanned. |
226 } else { | 231 } else { |
227 // This is where we try to do the expensive meta-refresh. | 232 // This is where we try to do the expensive meta-refresh. |
228 if (std::string::npos == mime_type_.find("text/html")) { | 233 if (std::string::npos == mime_type_.find("text/html")) { |
229 // Since we can't do a meta-refresh (along with an exponential | 234 // Since we can't do a meta-refresh (along with an exponential |
230 // backoff), we'll just make sure this NEVER happens again. | 235 // backoff), we'll just make sure this NEVER happens again. |
231 url_request_context_->sdch_manager()->BlacklistDomainForever(url_); | 236 url_request_context_->sdch_manager()->BlacklistDomainForever(url_); |
232 if (filter_context_.IsCachedContent()) | 237 if (filter_context_.IsCachedContent()) |
233 SdchManager::SdchErrorRecovery( | 238 GetSdchManager()->SdchErrorRecovery( |
234 SdchManager::CACHED_META_REFRESH_UNSUPPORTED); | 239 SdchManager::CACHED_META_REFRESH_UNSUPPORTED, url_); |
235 else | 240 else |
236 SdchManager::SdchErrorRecovery( | 241 GetSdchManager()->SdchErrorRecovery( |
237 SdchManager::META_REFRESH_UNSUPPORTED); | 242 SdchManager::META_REFRESH_UNSUPPORTED, url_); |
238 return FILTER_ERROR; | 243 return FILTER_ERROR; |
239 } | 244 } |
240 // HTML content means we can issue a meta-refresh, and get the content | 245 // HTML content means we can issue a meta-refresh, and get the content |
241 // again, perhaps without SDCH (to be safe). | 246 // again, perhaps without SDCH (to be safe). |
242 if (filter_context_.IsCachedContent()) { | 247 if (filter_context_.IsCachedContent()) { |
243 // Cached content is probably a startup tab, so we'll just get fresh | 248 // Cached content is probably a startup tab, so we'll just get fresh |
244 // content and try again, without disabling sdch. | 249 // content and try again, without disabling sdch. |
245 SdchManager::SdchErrorRecovery( | 250 GetSdchManager()->SdchErrorRecovery( |
246 SdchManager::META_REFRESH_CACHED_RECOVERY); | 251 SdchManager::META_REFRESH_CACHED_RECOVERY, url_); |
247 } else { | 252 } else { |
248 // Since it wasn't in the cache, we definately need at least some | 253 // Since it wasn't in the cache, we definately need at least some |
249 // period of blacklisting to get the correct content. | 254 // period of blacklisting to get the correct content. |
250 url_request_context_->sdch_manager()->BlacklistDomain(url_); | 255 url_request_context_->sdch_manager()->BlacklistDomain(url_); |
251 SdchManager::SdchErrorRecovery(SdchManager::META_REFRESH_RECOVERY); | 256 GetSdchManager()->SdchErrorRecovery( |
| 257 SdchManager::META_REFRESH_RECOVERY, url_); |
252 } | 258 } |
253 decoding_status_ = META_REFRESH_RECOVERY; | 259 decoding_status_ = META_REFRESH_RECOVERY; |
254 // Issue a meta redirect with SDCH disabled. | 260 // Issue a meta redirect with SDCH disabled. |
255 dest_buffer_excess_ = kDecompressionErrorHtml; | 261 dest_buffer_excess_ = kDecompressionErrorHtml; |
256 } | 262 } |
257 } else { | 263 } else { |
258 DCHECK_EQ(DECODING_IN_PROGRESS, decoding_status_); | 264 DCHECK_EQ(DECODING_IN_PROGRESS, decoding_status_); |
259 } | 265 } |
260 } | 266 } |
261 | 267 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
295 bool ret = vcdiff_streaming_decoder_->DecodeChunk( | 301 bool ret = vcdiff_streaming_decoder_->DecodeChunk( |
296 next_stream_data_, stream_data_len_, &dest_buffer_excess_); | 302 next_stream_data_, stream_data_len_, &dest_buffer_excess_); |
297 // Assume all data was used in decoding. | 303 // Assume all data was used in decoding. |
298 next_stream_data_ = NULL; | 304 next_stream_data_ = NULL; |
299 source_bytes_ += stream_data_len_; | 305 source_bytes_ += stream_data_len_; |
300 stream_data_len_ = 0; | 306 stream_data_len_ = 0; |
301 output_bytes_ += dest_buffer_excess_.size(); | 307 output_bytes_ += dest_buffer_excess_.size(); |
302 if (!ret) { | 308 if (!ret) { |
303 vcdiff_streaming_decoder_.reset(NULL); // Don't call it again. | 309 vcdiff_streaming_decoder_.reset(NULL); // Don't call it again. |
304 decoding_status_ = DECODING_ERROR; | 310 decoding_status_ = DECODING_ERROR; |
305 SdchManager::SdchErrorRecovery(SdchManager::DECODE_BODY_ERROR); | 311 GetSdchManager()->SdchErrorRecovery( |
| 312 SdchManager::DECODE_BODY_ERROR, url_); |
306 return FILTER_ERROR; | 313 return FILTER_ERROR; |
307 } | 314 } |
308 | 315 |
309 amount = OutputBufferExcess(dest_buffer, available_space); | 316 amount = OutputBufferExcess(dest_buffer, available_space); |
310 *dest_len += amount; | 317 *dest_len += amount; |
311 dest_buffer += amount; | 318 dest_buffer += amount; |
312 available_space -= amount; | 319 available_space -= amount; |
313 if (0 == available_space && !dest_buffer_excess_.empty()) | 320 if (0 == available_space && !dest_buffer_excess_.empty()) |
314 return FILTER_OK; | 321 return FILTER_OK; |
315 return FILTER_NEED_MORE_DATA; | 322 return FILTER_NEED_MORE_DATA; |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
352 DCHECK(dictionary_hash_.size() == kServerIdLength); | 359 DCHECK(dictionary_hash_.size() == kServerIdLength); |
353 // Since dictionary was not found, check to see if hash was even plausible. | 360 // Since dictionary was not found, check to see if hash was even plausible. |
354 for (size_t i = 0; i < kServerIdLength - 1; ++i) { | 361 for (size_t i = 0; i < kServerIdLength - 1; ++i) { |
355 char base64_char = dictionary_hash_[i]; | 362 char base64_char = dictionary_hash_[i]; |
356 if (!isalnum(base64_char) && '-' != base64_char && '_' != base64_char) { | 363 if (!isalnum(base64_char) && '-' != base64_char && '_' != base64_char) { |
357 dictionary_hash_is_plausible_ = false; | 364 dictionary_hash_is_plausible_ = false; |
358 break; | 365 break; |
359 } | 366 } |
360 } | 367 } |
361 if (dictionary_hash_is_plausible_) | 368 if (dictionary_hash_is_plausible_) |
362 SdchManager::SdchErrorRecovery(SdchManager::DICTIONARY_HASH_NOT_FOUND); | 369 GetSdchManager()->SdchErrorRecovery( |
| 370 SdchManager::DICTIONARY_HASH_NOT_FOUND, url_); |
363 else | 371 else |
364 SdchManager::SdchErrorRecovery(SdchManager::DICTIONARY_HASH_MALFORMED); | 372 GetSdchManager()->SdchErrorRecovery( |
| 373 SdchManager::DICTIONARY_HASH_MALFORMED, url_); |
365 decoding_status_ = DECODING_ERROR; | 374 decoding_status_ = DECODING_ERROR; |
366 return FILTER_ERROR; | 375 return FILTER_ERROR; |
367 } | 376 } |
368 vcdiff_streaming_decoder_.reset(new open_vcdiff::VCDiffStreamingDecoder); | 377 vcdiff_streaming_decoder_.reset(new open_vcdiff::VCDiffStreamingDecoder); |
369 vcdiff_streaming_decoder_->SetAllowVcdTarget(false); | 378 vcdiff_streaming_decoder_->SetAllowVcdTarget(false); |
370 vcdiff_streaming_decoder_->StartDecoding(dictionary_->text().data(), | 379 vcdiff_streaming_decoder_->StartDecoding(dictionary_->text().data(), |
371 dictionary_->text().size()); | 380 dictionary_->text().size()); |
372 decoding_status_ = DECODING_IN_PROGRESS; | 381 decoding_status_ = DECODING_IN_PROGRESS; |
373 return FILTER_OK; | 382 return FILTER_OK; |
374 } | 383 } |
375 | 384 |
376 int SdchFilter::OutputBufferExcess(char* const dest_buffer, | 385 int SdchFilter::OutputBufferExcess(char* const dest_buffer, |
377 size_t available_space) { | 386 size_t available_space) { |
378 if (dest_buffer_excess_.empty()) | 387 if (dest_buffer_excess_.empty()) |
379 return 0; | 388 return 0; |
380 DCHECK(dest_buffer_excess_.size() > dest_buffer_excess_index_); | 389 DCHECK(dest_buffer_excess_.size() > dest_buffer_excess_index_); |
381 size_t amount = std::min(available_space, | 390 size_t amount = std::min(available_space, |
382 dest_buffer_excess_.size() - dest_buffer_excess_index_); | 391 dest_buffer_excess_.size() - dest_buffer_excess_index_); |
383 memcpy(dest_buffer, dest_buffer_excess_.data() + dest_buffer_excess_index_, | 392 memcpy(dest_buffer, dest_buffer_excess_.data() + dest_buffer_excess_index_, |
384 amount); | 393 amount); |
385 dest_buffer_excess_index_ += amount; | 394 dest_buffer_excess_index_ += amount; |
386 if (dest_buffer_excess_.size() <= dest_buffer_excess_index_) { | 395 if (dest_buffer_excess_.size() <= dest_buffer_excess_index_) { |
387 DCHECK(dest_buffer_excess_.size() == dest_buffer_excess_index_); | 396 DCHECK(dest_buffer_excess_.size() == dest_buffer_excess_index_); |
388 dest_buffer_excess_.clear(); | 397 dest_buffer_excess_.clear(); |
389 dest_buffer_excess_index_ = 0; | 398 dest_buffer_excess_index_ = 0; |
390 } | 399 } |
391 return amount; | 400 return amount; |
392 } | 401 } |
393 | 402 |
| 403 SdchManager* SdchFilter::GetSdchManager() const { |
| 404 return url_request_context_->sdch_manager(); |
| 405 } |
| 406 |
394 } // namespace net | 407 } // namespace net |
OLD | NEW |