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

Side by Side Diff: net/base/sdch_manager.h

Issue 155064: Merge r18936.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/branches/172/src/
Patch Set: Created 11 years, 5 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
« no previous file with comments | « net/base/sdch_filter_unittest.cc ('k') | net/base/sdch_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/net/base/sdch_manager.h:r14162,16808,17560,18936
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 // Provides global database of differential decompression dictionaries for the 5 // Provides global database of differential decompression dictionaries for the
6 // SDCH filter (processes sdch enconded content). 6 // SDCH filter (processes sdch enconded content).
7 7
8 // Exactly one instance of SdchManager is built, and all references are made 8 // Exactly one instance of SdchManager is built, and all references are made
9 // into that collection. 9 // into that collection.
10 // 10 //
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 // Problematic decode recovery methods. 114 // Problematic decode recovery methods.
115 META_REFRESH_RECOVERY = 70, // Dictionary not found. 115 META_REFRESH_RECOVERY = 70, // Dictionary not found.
116 // defunct = 71, // Almost the same as META_REFRESH_UNSUPPORTED. 116 // defunct = 71, // Almost the same as META_REFRESH_UNSUPPORTED.
117 // defunct = 72, // Almost the same as CACHED_META_REFRESH_UNSUPPORTED. 117 // defunct = 72, // Almost the same as CACHED_META_REFRESH_UNSUPPORTED.
118 // defunct = 73, // PASSING_THROUGH_NON_SDCH plus DISCARD_TENTATIVE_SDCH. 118 // defunct = 73, // PASSING_THROUGH_NON_SDCH plus DISCARD_TENTATIVE_SDCH.
119 META_REFRESH_UNSUPPORTED = 74, // Unrecoverable error. 119 META_REFRESH_UNSUPPORTED = 74, // Unrecoverable error.
120 CACHED_META_REFRESH_UNSUPPORTED = 75, // As above, but pulled from cache. 120 CACHED_META_REFRESH_UNSUPPORTED = 75, // As above, but pulled from cache.
121 PASSING_THROUGH_NON_SDCH = 76, // Non-html tagged as sdch but malformed. 121 PASSING_THROUGH_NON_SDCH = 76, // Non-html tagged as sdch but malformed.
122 INCOMPLETE_SDCH_CONTENT = 77, // Last window was not completely decoded. 122 INCOMPLETE_SDCH_CONTENT = 77, // Last window was not completely decoded.
123 123 PASS_THROUGH_404_CODE = 78, // URL not found message passing through.
124 124
125 // Common decoded recovery methods. 125 // Common decoded recovery methods.
126 META_REFRESH_CACHED_RECOVERY = 80, // Probably startup tab loading. 126 META_REFRESH_CACHED_RECOVERY = 80, // Probably startup tab loading.
127 DISCARD_TENTATIVE_SDCH = 81, // Server decided not to use sdch. 127 DISCARD_TENTATIVE_SDCH = 81, // Server decided not to use sdch.
128 128
129 // Non SDCH problems, only accounted for to make stat counting complete 129 // Non SDCH problems, only accounted for to make stat counting complete
130 // (i.e., be able to be sure all dictionary advertisements are accounted 130 // (i.e., be able to be sure all dictionary advertisements are accounted
131 // for). 131 // for).
132 132
133 UNFLUSHED_CONTENT = 90, // Possible error in filter chaining. 133 UNFLUSHED_CONTENT = 90, // Possible error in filter chaining.
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 DomainCounter blacklisted_domains_; 334 DomainCounter blacklisted_domains_;
335 335
336 // Support exponential backoff in number of domain accesses before 336 // Support exponential backoff in number of domain accesses before
337 // blacklisting expires. 337 // blacklisting expires.
338 DomainCounter exponential_blacklist_count; 338 DomainCounter exponential_blacklist_count;
339 339
340 DISALLOW_COPY_AND_ASSIGN(SdchManager); 340 DISALLOW_COPY_AND_ASSIGN(SdchManager);
341 }; 341 };
342 342
343 #endif // NET_BASE_SDCH_MANAGER_H_ 343 #endif // NET_BASE_SDCH_MANAGER_H_
OLDNEW
« no previous file with comments | « net/base/sdch_filter_unittest.cc ('k') | net/base/sdch_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698