diff options
author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 02:14:11 +0000 |
---|---|---|
committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 02:14:11 +0000 |
commit | febd935515d57eaf96a4d31c657a8bc5b3c48cc3 (patch) | |
tree | 7257a7b761942c6985e5eeafdcb66d1eb0a20aef /net | |
parent | 9b4d1245790eef6fc6b90257b444a6b3f4201859 (diff) | |
download | chromium_src-febd935515d57eaf96a4d31c657a8bc5b3c48cc3.zip chromium_src-febd935515d57eaf96a4d31c657a8bc5b3c48cc3.tar.gz chromium_src-febd935515d57eaf96a4d31c657a8bc5b3c48cc3.tar.bz2 |
Adjust SDCH problem code histogram.
Tentative SDCH was not properly noted, and this caused some confusion
in the SDCH problem codes. I corrected the assertion of a tentative sdch,
and renumbered (to new numbers) all problem codes that might have been
varied.
r=huanr
Review URL: http://codereview.chromium.org/18780
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r-- | net/base/filter.cc | 2 | ||||
-rw-r--r-- | net/base/filter_unittest.cc | 2 | ||||
-rw-r--r-- | net/base/sdch_manager.h | 10 |
3 files changed, 9 insertions, 5 deletions
diff --git a/net/base/filter.cc b/net/base/filter.cc index 57a13ef..89ef150 100644 --- a/net/base/filter.cc +++ b/net/base/filter.cc @@ -146,7 +146,7 @@ void Filter::FixupEncodingTypes( else SdchManager::SdchErrorRecovery(SdchManager::FIXED_CONTENT_ENCODINGS); encoding_types->clear(); - encoding_types->push_back(FILTER_TYPE_SDCH); + encoding_types->push_back(FILTER_TYPE_SDCH_POSSIBLE); encoding_types->push_back(FILTER_TYPE_GZIP_HELPING_SDCH); return; } diff --git a/net/base/filter_unittest.cc b/net/base/filter_unittest.cc index 950132e..0d306e1 100644 --- a/net/base/filter_unittest.cc +++ b/net/base/filter_unittest.cc @@ -123,7 +123,7 @@ TEST(FilterTest, MissingSdchEncoding) { encoding_types.clear(); Filter::FixupEncodingTypes(is_sdch_response, kTextHtmlMime, &encoding_types); EXPECT_EQ(2U, encoding_types.size()); - EXPECT_EQ(Filter::FILTER_TYPE_SDCH, encoding_types[0]); + EXPECT_EQ(Filter::FILTER_TYPE_SDCH_POSSIBLE, encoding_types[0]); EXPECT_EQ(Filter::FILTER_TYPE_GZIP_HELPING_SDCH, encoding_types[1]); // No encoding, but it was an SDCH response with non-html type. diff --git a/net/base/sdch_manager.h b/net/base/sdch_manager.h index 5870c17..1363d7ac 100644 --- a/net/base/sdch_manager.h +++ b/net/base/sdch_manager.h @@ -107,9 +107,13 @@ class SdchManager { // Problematic decode recovery methods. META_REFRESH_RECOVERY = 70, // Dictionary not found. - META_REFRESH_UNSUPPORTED = 71, // Unrecoverable error. - CACHED_META_REFRESH_UNSUPPORTED = 72, // As above, but pulled from cache. - PASSING_THROUGH_NON_SDCH = 73, // Non-html tagged as sdch but malformed. + // defunct = 71, // ALmost the same as META_REFRESH_UNSUPPORTED. + // defunct = 72, // Almost the same as CACHED_META_REFRESH_UNSUPPORTED. + // defunct = 73, // PASSING_THROUGH_NON_SDCH plus DISCARD_TENTATIVE_SDCH. + META_REFRESH_UNSUPPORTED = 74, // Unrecoverable error. + CACHED_META_REFRESH_UNSUPPORTED = 75, // As above, but pulled from cache. + PASSING_THROUGH_NON_SDCH = 76, // Non-html tagged as sdch but malformed. + // Common decoded recovery methods. META_REFRESH_CACHED_RECOVERY = 80, // Probably startup tab loading. |