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

Side by Side Diff: net/filter/sdch_filter.cc

Issue 423813002: Sdch view for net-internals (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Create Dictionary JSON directly in SdchManager::SdchInfoToValue Created 6 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 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>
11 11
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/metrics/histogram.h" 13 #include "base/metrics/histogram.h"
14 #include "net/base/sdch_manager.h" 14 #include "net/base/sdch_manager.h"
15 #include "net/base/sdch_net_log_params.h"
15 #include "net/url_request/url_request_context.h" 16 #include "net/url_request/url_request_context.h"
16 17
17 #include "sdch/open-vcdiff/src/google/vcdecoder.h" 18 #include "sdch/open-vcdiff/src/google/vcdecoder.h"
18 19
19 namespace net { 20 namespace net {
20 21
21 SdchFilter::SdchFilter(const FilterContext& filter_context) 22 SdchFilter::SdchFilter(const FilterContext& filter_context)
22 : filter_context_(filter_context), 23 : filter_context_(filter_context),
23 decoding_status_(DECODING_UNINITIALIZED), 24 decoding_status_(DECODING_UNINITIALIZED),
24 dictionary_hash_(), 25 dictionary_hash_(),
(...skipping 18 matching lines...) Expand all
43 44
44 static int filter_use_count = 0; 45 static int filter_use_count = 0;
45 ++filter_use_count; 46 ++filter_use_count;
46 if (META_REFRESH_RECOVERY == decoding_status_) { 47 if (META_REFRESH_RECOVERY == decoding_status_) {
47 UMA_HISTOGRAM_COUNTS("Sdch3.FilterUseBeforeDisabling", filter_use_count); 48 UMA_HISTOGRAM_COUNTS("Sdch3.FilterUseBeforeDisabling", filter_use_count);
48 } 49 }
49 50
50 if (vcdiff_streaming_decoder_.get()) { 51 if (vcdiff_streaming_decoder_.get()) {
51 if (!vcdiff_streaming_decoder_->FinishDecoding()) { 52 if (!vcdiff_streaming_decoder_->FinishDecoding()) {
52 decoding_status_ = DECODING_ERROR; 53 decoding_status_ = DECODING_ERROR;
53 SdchManager::SdchErrorRecovery(SdchManager::INCOMPLETE_SDCH_CONTENT); 54 LogSdchProblem(SdchManager::INCOMPLETE_SDCH_CONTENT);
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 LogSdchProblem(SdchManager::UNFLUSHED_CONTENT);
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 LogSdchProblem(SdchManager::CACHE_DECODED);
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 url_request_context_->sdch_manager()->SetAllowLatencyExperiment(
96 url_, true); 97 url_, true);
97 return; 98 return;
98 } 99 }
99 case PASS_THROUGH: { 100 case PASS_THROUGH: {
100 filter_context_.RecordPacketStats(FilterContext::SDCH_PASSTHROUGH); 101 filter_context_.RecordPacketStats(FilterContext::SDCH_PASSTHROUGH);
101 return; 102 return;
102 } 103 }
103 case DECODING_UNINITIALIZED: { 104 case DECODING_UNINITIALIZED: {
104 SdchManager::SdchErrorRecovery(SdchManager::UNINITIALIZED); 105 LogSdchProblem(SdchManager::UNINITIALIZED);
105 return; 106 return;
106 } 107 }
107 case WAITING_FOR_DICTIONARY_SELECTION: { 108 case WAITING_FOR_DICTIONARY_SELECTION: {
108 SdchManager::SdchErrorRecovery(SdchManager::PRIOR_TO_DICTIONARY); 109 LogSdchProblem(SdchManager::PRIOR_TO_DICTIONARY);
109 return; 110 return;
110 } 111 }
111 case DECODING_ERROR: { 112 case DECODING_ERROR: {
112 SdchManager::SdchErrorRecovery(SdchManager::DECODE_ERROR); 113 LogSdchProblem(SdchManager::DECODE_ERROR);
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
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 LogSdchProblem(SdchManager::PASS_THROUGH_404_CODE);
179 decoding_status_ = PASS_THROUGH; 180 decoding_status_ = PASS_THROUGH;
180 } else if (filter_context_.GetResponseCode() != 200) { 181 } else if (filter_context_.GetResponseCode() != 200) {
181 // We need to meta-refresh, with SDCH disabled. 182 // We need to meta-refresh, with SDCH disabled.
182 } else if (filter_context_.IsCachedContent() 183 } else if (filter_context_.IsCachedContent()
183 && !dictionary_hash_is_plausible_) { 184 && !dictionary_hash_is_plausible_) {
184 // We must have hit the back button, and gotten content that was fetched 185 // We must have hit the back button, and gotten content that was fetched
185 // before we *really* advertised SDCH and a dictionary. 186 // before we *really* advertised SDCH and a dictionary.
186 SdchManager::SdchErrorRecovery(SdchManager::PASS_THROUGH_OLD_CACHED); 187 LogSdchProblem(SdchManager::PASS_THROUGH_OLD_CACHED);
187 decoding_status_ = PASS_THROUGH; 188 decoding_status_ = PASS_THROUGH;
188 } else if (possible_pass_through_) { 189 } else if (possible_pass_through_) {
189 // This is the potentially most graceful response. There really was no 190 // This is the potentially most graceful response. There really was no
190 // error. We were just overly cautious when we added a TENTATIVE_SDCH. 191 // 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. 192 // We added the sdch coding tag, and it should not have been added.
192 // This can happen in server experiments, where the server decides 193 // This can happen in server experiments, where the server decides
193 // not to use sdch, even though there is a dictionary. To be 194 // not to use sdch, even though there is a dictionary. To be
194 // conservative, we locally added the tentative sdch (fearing that a 195 // conservative, we locally added the tentative sdch (fearing that a
195 // proxy stripped it!) and we must now recant (pass through). 196 // proxy stripped it!) and we must now recant (pass through).
196 SdchManager::SdchErrorRecovery(SdchManager::DISCARD_TENTATIVE_SDCH); 197 LogSdchProblem(SdchManager::DISCARD_TENTATIVE_SDCH);
197 // However.... just to be sure we don't get burned by proxies that 198 // 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 199 // 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 200 // is compressed data etc. For now, we do nothing, which gets us into
200 // the meta-refresh result. 201 // the meta-refresh result.
201 // TODO(jar): Improve robustness by sniffing for valid text that we can 202 // TODO(jar): Improve robustness by sniffing for valid text that we can
202 // actual use re: decoding_status_ = PASS_THROUGH; 203 // actual use re: decoding_status_ = PASS_THROUGH;
203 } else if (dictionary_hash_is_plausible_) { 204 } else if (dictionary_hash_is_plausible_) {
204 // We need a meta-refresh since we don't have the dictionary. 205 // 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 206 // 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. 207 // cached content that was saved when we had a dictionary.
207 } else if (filter_context_.IsSdchResponse()) { 208 } else if (filter_context_.IsSdchResponse()) {
208 // This is a very corrupt SDCH request response. We can't decode it. 209 // 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. 210 // We'll use a meta-refresh, and get content without asking for SDCH.
210 // This will also progressively disable SDCH for this domain. 211 // This will also progressively disable SDCH for this domain.
211 } else { 212 } else {
212 // One of the first 9 bytes precluded consideration as a hash. 213 // 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. 214 // 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 215 // This is a major error, as the server or proxy tagged this SDCH even
215 // though it is not! 216 // though it is not!
216 // Meta-refresh won't help, as we didn't advertise an SDCH dictionary!! 217 // 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. 218 // Worse yet, meta-refresh could lead to an infinite refresh loop.
218 SdchManager::SdchErrorRecovery(SdchManager::PASSING_THROUGH_NON_SDCH); 219 LogSdchProblem(SdchManager::PASSING_THROUGH_NON_SDCH);
219 decoding_status_ = PASS_THROUGH; 220 decoding_status_ = PASS_THROUGH;
220 // ... but further back-off on advertising SDCH support. 221 // ... but further back-off on advertising SDCH support.
221 url_request_context_->sdch_manager()->BlacklistDomain(url_); 222 url_request_context_->sdch_manager()->BlacklistDomain(url_);
222 } 223 }
223 224
224 if (decoding_status_ == PASS_THROUGH) { 225 if (decoding_status_ == PASS_THROUGH) {
225 dest_buffer_excess_ = dictionary_hash_; // Send what we scanned. 226 dest_buffer_excess_ = dictionary_hash_; // Send what we scanned.
226 } else { 227 } else {
227 // This is where we try to do the expensive meta-refresh. 228 // This is where we try to do the expensive meta-refresh.
228 if (std::string::npos == mime_type_.find("text/html")) { 229 if (std::string::npos == mime_type_.find("text/html")) {
229 // Since we can't do a meta-refresh (along with an exponential 230 // Since we can't do a meta-refresh (along with an exponential
230 // backoff), we'll just make sure this NEVER happens again. 231 // backoff), we'll just make sure this NEVER happens again.
231 url_request_context_->sdch_manager()->BlacklistDomainForever(url_); 232 url_request_context_->sdch_manager()->BlacklistDomainForever(url_);
232 if (filter_context_.IsCachedContent()) 233 if (filter_context_.IsCachedContent())
233 SdchManager::SdchErrorRecovery( 234 LogSdchProblem(SdchManager::CACHED_META_REFRESH_UNSUPPORTED);
234 SdchManager::CACHED_META_REFRESH_UNSUPPORTED);
235 else 235 else
236 SdchManager::SdchErrorRecovery( 236 LogSdchProblem(SdchManager::META_REFRESH_UNSUPPORTED);
237 SdchManager::META_REFRESH_UNSUPPORTED);
238 return FILTER_ERROR; 237 return FILTER_ERROR;
239 } 238 }
240 // HTML content means we can issue a meta-refresh, and get the content 239 // HTML content means we can issue a meta-refresh, and get the content
241 // again, perhaps without SDCH (to be safe). 240 // again, perhaps without SDCH (to be safe).
242 if (filter_context_.IsCachedContent()) { 241 if (filter_context_.IsCachedContent()) {
243 // Cached content is probably a startup tab, so we'll just get fresh 242 // Cached content is probably a startup tab, so we'll just get fresh
244 // content and try again, without disabling sdch. 243 // content and try again, without disabling sdch.
245 SdchManager::SdchErrorRecovery( 244 LogSdchProblem(SdchManager::META_REFRESH_CACHED_RECOVERY);
246 SdchManager::META_REFRESH_CACHED_RECOVERY);
247 } else { 245 } else {
248 // Since it wasn't in the cache, we definately need at least some 246 // Since it wasn't in the cache, we definately need at least some
249 // period of blacklisting to get the correct content. 247 // period of blacklisting to get the correct content.
250 url_request_context_->sdch_manager()->BlacklistDomain(url_); 248 url_request_context_->sdch_manager()->BlacklistDomain(url_);
251 SdchManager::SdchErrorRecovery(SdchManager::META_REFRESH_RECOVERY); 249 LogSdchProblem(SdchManager::META_REFRESH_RECOVERY);
252 } 250 }
253 decoding_status_ = META_REFRESH_RECOVERY; 251 decoding_status_ = META_REFRESH_RECOVERY;
254 // Issue a meta redirect with SDCH disabled. 252 // Issue a meta redirect with SDCH disabled.
255 dest_buffer_excess_ = kDecompressionErrorHtml; 253 dest_buffer_excess_ = kDecompressionErrorHtml;
256 } 254 }
257 } else { 255 } else {
258 DCHECK_EQ(DECODING_IN_PROGRESS, decoding_status_); 256 DCHECK_EQ(DECODING_IN_PROGRESS, decoding_status_);
259 } 257 }
260 } 258 }
261 259
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 bool ret = vcdiff_streaming_decoder_->DecodeChunk( 293 bool ret = vcdiff_streaming_decoder_->DecodeChunk(
296 next_stream_data_, stream_data_len_, &dest_buffer_excess_); 294 next_stream_data_, stream_data_len_, &dest_buffer_excess_);
297 // Assume all data was used in decoding. 295 // Assume all data was used in decoding.
298 next_stream_data_ = NULL; 296 next_stream_data_ = NULL;
299 source_bytes_ += stream_data_len_; 297 source_bytes_ += stream_data_len_;
300 stream_data_len_ = 0; 298 stream_data_len_ = 0;
301 output_bytes_ += dest_buffer_excess_.size(); 299 output_bytes_ += dest_buffer_excess_.size();
302 if (!ret) { 300 if (!ret) {
303 vcdiff_streaming_decoder_.reset(NULL); // Don't call it again. 301 vcdiff_streaming_decoder_.reset(NULL); // Don't call it again.
304 decoding_status_ = DECODING_ERROR; 302 decoding_status_ = DECODING_ERROR;
305 SdchManager::SdchErrorRecovery(SdchManager::DECODE_BODY_ERROR); 303 LogSdchProblem(SdchManager::DECODE_BODY_ERROR);
306 return FILTER_ERROR; 304 return FILTER_ERROR;
307 } 305 }
308 306
309 amount = OutputBufferExcess(dest_buffer, available_space); 307 amount = OutputBufferExcess(dest_buffer, available_space);
310 *dest_len += amount; 308 *dest_len += amount;
311 dest_buffer += amount; 309 dest_buffer += amount;
312 available_space -= amount; 310 available_space -= amount;
313 if (0 == available_space && !dest_buffer_excess_.empty()) 311 if (0 == available_space && !dest_buffer_excess_.empty())
314 return FILTER_OK; 312 return FILTER_OK;
315 return FILTER_NEED_MORE_DATA; 313 return FILTER_NEED_MORE_DATA;
(...skipping 18 matching lines...) Expand all
334 if (stream_data_len_ > 0) 332 if (stream_data_len_ > 0)
335 next_stream_data_ += bytes_needed; 333 next_stream_data_ += bytes_needed;
336 else 334 else
337 next_stream_data_ = NULL; 335 next_stream_data_ = NULL;
338 336
339 DCHECK(!dictionary_); 337 DCHECK(!dictionary_);
340 dictionary_hash_is_plausible_ = true; // Assume plausible, but check. 338 dictionary_hash_is_plausible_ = true; // Assume plausible, but check.
341 339
342 if ('\0' == dictionary_hash_[kServerIdLength - 1]) { 340 if ('\0' == dictionary_hash_[kServerIdLength - 1]) {
343 SdchManager* manager(url_request_context_->sdch_manager()); 341 SdchManager* manager(url_request_context_->sdch_manager());
344 manager->GetVcdiffDictionary( 342 SdchManager::ProblemCodes rv = manager->GetVcdiffDictionary(
345 std::string(dictionary_hash_, 0, kServerIdLength - 1), 343 std::string(dictionary_hash_, 0, kServerIdLength - 1),
346 url_, &dictionary_); 344 url_,
345 &dictionary_);
346 if (rv != SdchManager::PROBLEM_CODE_OK)
347 LogSdchProblem(rv);
347 } else { 348 } else {
348 dictionary_hash_is_plausible_ = false; 349 dictionary_hash_is_plausible_ = false;
349 } 350 }
350 351
351 if (!dictionary_) { 352 if (!dictionary_) {
352 DCHECK(dictionary_hash_.size() == kServerIdLength); 353 DCHECK(dictionary_hash_.size() == kServerIdLength);
353 // Since dictionary was not found, check to see if hash was even plausible. 354 // Since dictionary was not found, check to see if hash was even plausible.
354 for (size_t i = 0; i < kServerIdLength - 1; ++i) { 355 for (size_t i = 0; i < kServerIdLength - 1; ++i) {
355 char base64_char = dictionary_hash_[i]; 356 char base64_char = dictionary_hash_[i];
356 if (!isalnum(base64_char) && '-' != base64_char && '_' != base64_char) { 357 if (!isalnum(base64_char) && '-' != base64_char && '_' != base64_char) {
357 dictionary_hash_is_plausible_ = false; 358 dictionary_hash_is_plausible_ = false;
358 break; 359 break;
359 } 360 }
360 } 361 }
361 if (dictionary_hash_is_plausible_) 362 if (dictionary_hash_is_plausible_)
362 SdchManager::SdchErrorRecovery(SdchManager::DICTIONARY_HASH_NOT_FOUND); 363 LogSdchProblem(SdchManager::DICTIONARY_HASH_NOT_FOUND);
363 else 364 else
364 SdchManager::SdchErrorRecovery(SdchManager::DICTIONARY_HASH_MALFORMED); 365 LogSdchProblem(SdchManager::DICTIONARY_HASH_MALFORMED);
365 decoding_status_ = DECODING_ERROR; 366 decoding_status_ = DECODING_ERROR;
366 return FILTER_ERROR; 367 return FILTER_ERROR;
367 } 368 }
368 vcdiff_streaming_decoder_.reset(new open_vcdiff::VCDiffStreamingDecoder); 369 vcdiff_streaming_decoder_.reset(new open_vcdiff::VCDiffStreamingDecoder);
369 vcdiff_streaming_decoder_->SetAllowVcdTarget(false); 370 vcdiff_streaming_decoder_->SetAllowVcdTarget(false);
370 vcdiff_streaming_decoder_->StartDecoding(dictionary_->text().data(), 371 vcdiff_streaming_decoder_->StartDecoding(dictionary_->text().data(),
371 dictionary_->text().size()); 372 dictionary_->text().size());
372 decoding_status_ = DECODING_IN_PROGRESS; 373 decoding_status_ = DECODING_IN_PROGRESS;
373 return FILTER_OK; 374 return FILTER_OK;
374 } 375 }
375 376
376 int SdchFilter::OutputBufferExcess(char* const dest_buffer, 377 int SdchFilter::OutputBufferExcess(char* const dest_buffer,
377 size_t available_space) { 378 size_t available_space) {
378 if (dest_buffer_excess_.empty()) 379 if (dest_buffer_excess_.empty())
379 return 0; 380 return 0;
380 DCHECK(dest_buffer_excess_.size() > dest_buffer_excess_index_); 381 DCHECK(dest_buffer_excess_.size() > dest_buffer_excess_index_);
381 size_t amount = std::min(available_space, 382 size_t amount = std::min(available_space,
382 dest_buffer_excess_.size() - dest_buffer_excess_index_); 383 dest_buffer_excess_.size() - dest_buffer_excess_index_);
383 memcpy(dest_buffer, dest_buffer_excess_.data() + dest_buffer_excess_index_, 384 memcpy(dest_buffer, dest_buffer_excess_.data() + dest_buffer_excess_index_,
384 amount); 385 amount);
385 dest_buffer_excess_index_ += amount; 386 dest_buffer_excess_index_ += amount;
386 if (dest_buffer_excess_.size() <= dest_buffer_excess_index_) { 387 if (dest_buffer_excess_.size() <= dest_buffer_excess_index_) {
387 DCHECK(dest_buffer_excess_.size() == dest_buffer_excess_index_); 388 DCHECK(dest_buffer_excess_.size() == dest_buffer_excess_index_);
388 dest_buffer_excess_.clear(); 389 dest_buffer_excess_.clear();
389 dest_buffer_excess_index_ = 0; 390 dest_buffer_excess_index_ = 0;
390 } 391 }
391 return amount; 392 return amount;
392 } 393 }
393 394
395 void SdchFilter::LogSdchProblem(SdchManager::ProblemCodes problem) {
396 SdchManager::SdchErrorRecovery(problem);
397 filter_context_.GetNetLog().AddEvent(
398 NetLog::TYPE_SDCH_RESOURCE_ERROR,
399 base::Bind(&NetLogSdchResourceProblemCallback, problem));
400 }
401
394 } // namespace net 402 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698