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

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

Issue 298063006: Make SdchManager per-profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporated comments and changed test name. Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « net/filter/filter.h ('k') | net/filter/mock_filter_context.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/filter.h" 5 #include "net/filter/filter.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "net/base/filename_util_unsafe.h" 9 #include "net/base/filename_util_unsafe.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
11 #include "net/base/mime_util.h" 11 #include "net/base/mime_util.h"
12 #include "net/filter/gzip_filter.h" 12 #include "net/filter/gzip_filter.h"
13 #include "net/filter/sdch_filter.h" 13 #include "net/filter/sdch_filter.h"
14 #include "net/url_request/url_request_context.h"
14 #include "url/gurl.h" 15 #include "url/gurl.h"
15 16
16 namespace { 17 namespace {
17 18
18 // Filter types (using canonical lower case only): 19 // Filter types (using canonical lower case only):
19 const char kDeflate[] = "deflate"; 20 const char kDeflate[] = "deflate";
20 const char kGZip[] = "gzip"; 21 const char kGZip[] = "gzip";
21 const char kXGZip[] = "x-gzip"; 22 const char kXGZip[] = "x-gzip";
22 const char kSdch[] = "sdch"; 23 const char kSdch[] = "sdch";
23 // compress and x-compress are currently not supported. If we decide to support 24 // compress and x-compress are currently not supported. If we decide to support
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 Filter* filter_list) { 367 Filter* filter_list) {
367 scoped_ptr<Filter> first_filter; // Soon to be start of chain. 368 scoped_ptr<Filter> first_filter; // Soon to be start of chain.
368 switch (type_id) { 369 switch (type_id) {
369 case FILTER_TYPE_GZIP_HELPING_SDCH: 370 case FILTER_TYPE_GZIP_HELPING_SDCH:
370 case FILTER_TYPE_DEFLATE: 371 case FILTER_TYPE_DEFLATE:
371 case FILTER_TYPE_GZIP: 372 case FILTER_TYPE_GZIP:
372 first_filter.reset(InitGZipFilter(type_id, buffer_size)); 373 first_filter.reset(InitGZipFilter(type_id, buffer_size));
373 break; 374 break;
374 case FILTER_TYPE_SDCH: 375 case FILTER_TYPE_SDCH:
375 case FILTER_TYPE_SDCH_POSSIBLE: 376 case FILTER_TYPE_SDCH_POSSIBLE:
376 if (SdchManager::Global() && SdchManager::sdch_enabled()) { 377 if (filter_context.GetURLRequestContext()->sdch_manager() &&
378 SdchManager::sdch_enabled()) {
377 first_filter.reset( 379 first_filter.reset(
378 InitSdchFilter(type_id, filter_context, buffer_size)); 380 InitSdchFilter(type_id, filter_context, buffer_size));
379 } 381 }
380 break; 382 break;
381 default: 383 default:
382 break; 384 break;
383 } 385 }
384 386
385 if (!first_filter.get()) 387 if (!first_filter.get())
386 return NULL; 388 return NULL;
(...skipping 11 matching lines...) Expand all
398 400
399 void Filter::PushDataIntoNextFilter() { 401 void Filter::PushDataIntoNextFilter() {
400 IOBuffer* next_buffer = next_filter_->stream_buffer(); 402 IOBuffer* next_buffer = next_filter_->stream_buffer();
401 int next_size = next_filter_->stream_buffer_size(); 403 int next_size = next_filter_->stream_buffer_size();
402 last_status_ = ReadFilteredData(next_buffer->data(), &next_size); 404 last_status_ = ReadFilteredData(next_buffer->data(), &next_size);
403 if (FILTER_ERROR != last_status_) 405 if (FILTER_ERROR != last_status_)
404 next_filter_->FlushStreamBuffer(next_size); 406 next_filter_->FlushStreamBuffer(next_size);
405 } 407 }
406 408
407 } // namespace net 409 } // namespace net
OLDNEW
« no previous file with comments | « net/filter/filter.h ('k') | net/filter/mock_filter_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698