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

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

Issue 711753003: Pin dictionaries from being deleted while request is outstanding. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync'd past SDCH net-internals CL (423813002) Created 6 years, 1 month 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 // SdchFilter applies open_vcdiff content decoding to a datastream. 5 // SdchFilter applies open_vcdiff content decoding to a datastream.
6 // This decoding uses a pre-cached dictionary of text fragments to decode 6 // This decoding uses a pre-cached dictionary of text fragments to decode
7 // (expand) the stream back to its original contents. 7 // (expand) the stream back to its original contents.
8 // 8 //
9 // This SdchFilter internally uses open_vcdiff/vcdec library to do decoding. 9 // This SdchFilter internally uses open_vcdiff/vcdec library to do decoding.
10 // 10 //
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 std::string dictionary_hash_; 85 std::string dictionary_hash_;
86 86
87 // After assembling an entire dictionary hash (the first 9 bytes of the 87 // After assembling an entire dictionary hash (the first 9 bytes of the
88 // sdch payload, we check to see if it is plausible, meaning it has a null 88 // sdch payload, we check to see if it is plausible, meaning it has a null
89 // termination, and has 8 characters that are possible in a net-safe base64 89 // termination, and has 8 characters that are possible in a net-safe base64
90 // encoding. If the hash is not plausible, then the payload is probably not 90 // encoding. If the hash is not plausible, then the payload is probably not
91 // an SDCH encoded bundle, and various error recovery strategies can be 91 // an SDCH encoded bundle, and various error recovery strategies can be
92 // attempted. 92 // attempted.
93 bool dictionary_hash_is_plausible_; 93 bool dictionary_hash_is_plausible_;
94 94
95 // We hold an in-memory copy of the dictionary during the entire decoding, as 95 // Validity of this pointer is guaranteed by either the FilterContext holding
96 // it is used directly by the VC-DIFF decoding system. 96 // a containing SdchManager::DictionarySet, or this object holding a
97 // That char* data is part of the dictionary_ we hold a reference to. 97 // container in |unexpected_dictionary_handle_| below.
98 scoped_refptr<SdchManager::Dictionary> dictionary_; 98 const SdchManager::Dictionary *dictionary_;
99 99
100 // We keep a copy of the URLRequestContext for use in the destructor, (at 100 // We keep a copy of the URLRequestContext for use in the destructor, (at
101 // which point GetURLRequestContext() will likely return null because of 101 // which point GetURLRequestContext() will likely return null because of
102 // the disassociation of the URLRequest from the URLRequestJob). This is 102 // the disassociation of the URLRequest from the URLRequestJob). This is
103 // safe because the URLRequestJob (and any filters) are guaranteed to be 103 // safe because the URLRequestJob (and any filters) are guaranteed to be
104 // deleted before the URLRequestContext is destroyed. 104 // deleted before the URLRequestContext is destroyed.
105 const URLRequestContext* const url_request_context_; 105 const URLRequestContext* const url_request_context_;
106 106
107 // The decoder may demand a larger output buffer than the target of 107 // The decoder may demand a larger output buffer than the target of
108 // ReadFilteredData so we buffer the excess output between calls. 108 // ReadFilteredData so we buffer the excess output between calls.
(...skipping 13 matching lines...) Expand all
122 bool possible_pass_through_; 122 bool possible_pass_through_;
123 123
124 // The URL that is currently being filtered. 124 // The URL that is currently being filtered.
125 // This is used to restrict use of a dictionary to a specific URL or path. 125 // This is used to restrict use of a dictionary to a specific URL or path.
126 GURL url_; 126 GURL url_;
127 127
128 // To facilitate error recovery, allow filter to know if content is text/html 128 // To facilitate error recovery, allow filter to know if content is text/html
129 // by checking within this mime type (we may do a meta-refresh via html). 129 // by checking within this mime type (we may do a meta-refresh via html).
130 std::string mime_type_; 130 std::string mime_type_;
131 131
132 // If the response was encoded with a dictionary different than those
133 // advertised (e.g. a cached response using an old dictionary), this
134 // variable preserves that dictionary from deletion during decoding.
135 scoped_ptr<SdchManager::DictionarySet> unexpected_dictionary_handle_;
136
132 DISALLOW_COPY_AND_ASSIGN(SdchFilter); 137 DISALLOW_COPY_AND_ASSIGN(SdchFilter);
133 }; 138 };
134 139
135 } // namespace net 140 } // namespace net
136 141
137 #endif // NET_FILTER_SDCH_FILTER_H_ 142 #endif // NET_FILTER_SDCH_FILTER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698