Index: net/filter/filter.cc |
diff --git a/net/filter/filter.cc b/net/filter/filter.cc |
index 497b9dc9d584d147141af6bc949840afd7b207fe..536458662eb93a75fe8fd29108974d62ba0694fb 100644 |
--- a/net/filter/filter.cc |
+++ b/net/filter/filter.cc |
@@ -16,19 +16,19 @@ |
namespace { |
// Filter types (using canonical lower case only): |
-const char kDeflate[] = "deflate"; |
-const char kGZip[] = "gzip"; |
-const char kXGZip[] = "x-gzip"; |
-const char kSdch[] = "sdch"; |
+const char kDeflate[] = "deflate"; |
+const char kGZip[] = "gzip"; |
+const char kXGZip[] = "x-gzip"; |
+const char kSdch[] = "sdch"; |
// compress and x-compress are currently not supported. If we decide to support |
// them, we'll need the same mime type compatibility hack we have for gzip. For |
// more information, see Firefox's nsHttpChannel::ProcessNormal. |
// Mime types: |
-const char kApplicationXGzip[] = "application/x-gzip"; |
-const char kApplicationGzip[] = "application/gzip"; |
-const char kApplicationXGunzip[] = "application/x-gunzip"; |
-const char kTextHtml[] = "text/html"; |
+const char kApplicationXGzip[] = "application/x-gzip"; |
+const char kApplicationGzip[] = "application/gzip"; |
+const char kApplicationXGunzip[] = "application/x-gunzip"; |
+const char kTextHtml[] = "text/html"; |
// Buffer size allocated when de-compressing data. |
const int kFilterBufSize = 32 * 1024; |
@@ -40,7 +40,8 @@ namespace net { |
FilterContext::~FilterContext() { |
} |
-Filter::~Filter() {} |
+Filter::~Filter() { |
+} |
// static |
Filter* Filter::Factory(const std::vector<FilterType>& filter_types, |
@@ -50,8 +51,8 @@ Filter* Filter::Factory(const std::vector<FilterType>& filter_types, |
Filter* filter_list = NULL; // Linked list of filters. |
for (size_t i = 0; i < filter_types.size(); i++) { |
- filter_list = PrependNewFilter(filter_types[i], filter_context, |
- kFilterBufSize, filter_list); |
+ filter_list = PrependNewFilter( |
+ filter_types[i], filter_context, kFilterBufSize, filter_list); |
if (!filter_list) |
return NULL; |
} |
@@ -72,8 +73,8 @@ Filter* Filter::FactoryForTests(const std::vector<FilterType>& filter_types, |
Filter* filter_list = NULL; // Linked list of filters. |
for (size_t i = 0; i < filter_types.size(); i++) { |
- filter_list = PrependNewFilter(filter_types[i], filter_context, |
- buffer_size, filter_list); |
+ filter_list = PrependNewFilter( |
+ filter_types[i], filter_context, buffer_size, filter_list); |
if (!filter_list) |
return NULL; |
} |
@@ -98,7 +99,7 @@ Filter::FilterStatus Filter::ReadData(char* dest_buffer, int* dest_len) { |
*dest_len = dest_buffer_capacity; // Reset the input/output parameter. |
next_filter_->ReadData(dest_buffer, dest_len); |
if (FILTER_NEED_MORE_DATA == last_status_) |
- return next_filter_->last_status(); |
+ return next_filter_->last_status(); |
// In the case where this filter has data internally, and is indicating such |
// with a last_status_ of FILTER_OK, but at the same time the next filter in |
@@ -153,9 +154,8 @@ Filter::FilterType Filter::ConvertEncodingToType( |
} |
// static |
-void Filter::FixupEncodingTypes( |
- const FilterContext& filter_context, |
- std::vector<FilterType>* encoding_types) { |
+void Filter::FixupEncodingTypes(const FilterContext& filter_context, |
+ std::vector<FilterType>* encoding_types) { |
std::string mime_type; |
bool success = filter_context.GetMimeType(&mime_type); |
DCHECK(success || mime_type.empty()); |
@@ -177,8 +177,8 @@ void Filter::FixupEncodingTypes( |
DCHECK(success); |
filter_context.GetContentDisposition(&disposition); |
// Don't supply a MIME type here, since that may cause disk IO. |
- base::FilePath filepath = GenerateFileName(url, disposition, "UTF-8", "", |
- "", ""); |
+ base::FilePath filepath = |
+ GenerateFileName(url, disposition, "UTF-8", "", "", ""); |
base::FilePath::StringType extension = filepath.Extension(); |
if (filter_context.IsDownload()) { |
@@ -215,8 +215,8 @@ void Filter::FixupEncodingTypes( |
} |
if ((1 == encoding_types->size()) && |
(FILTER_TYPE_SDCH == encoding_types->front())) { |
- SdchManager::SdchErrorRecovery( |
- SdchManager::SDCH_CONTENT_ENCODE_FOR_NON_SDCH_REQUEST); |
+ SdchManager::SdchErrorRecovery( |
+ SdchManager::SDCH_CONTENT_ENCODE_FOR_NON_SDCH_REQUEST); |
} |
return; |
} |
@@ -271,14 +271,11 @@ void Filter::FixupEncodingTypes( |
// Suspicious case: Advertised dictionary, but server didn't use sdch, and |
// we're HTML tagged. |
if (encoding_types->empty()) { |
- SdchManager::SdchErrorRecovery( |
- SdchManager::ADDED_CONTENT_ENCODING); |
+ SdchManager::SdchErrorRecovery(SdchManager::ADDED_CONTENT_ENCODING); |
} else if (1 == encoding_types->size()) { |
- SdchManager::SdchErrorRecovery( |
- SdchManager::FIXED_CONTENT_ENCODING); |
+ SdchManager::SdchErrorRecovery(SdchManager::FIXED_CONTENT_ENCODING); |
} else { |
- SdchManager::SdchErrorRecovery( |
- SdchManager::FIXED_CONTENT_ENCODINGS); |
+ SdchManager::SdchErrorRecovery(SdchManager::FIXED_CONTENT_ENCODINGS); |
} |
} else { |
// Remarkable case!?! We advertised an SDCH dictionary, content-encoding |
@@ -321,7 +318,8 @@ Filter::Filter() |
stream_buffer_size_(0), |
next_stream_data_(NULL), |
stream_data_len_(0), |
- last_status_(FILTER_NEED_MORE_DATA) {} |
+ last_status_(FILTER_NEED_MORE_DATA) { |
+} |
Filter::FilterStatus Filter::CopyOut(char* dest_buffer, int* dest_len) { |
int out_len; |