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

Side by Side Diff: content/public/renderer/document_state.h

Issue 10889019: Reset scale & scroll state after reloading with overridden URL (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase, nit fix Created 8 years, 3 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 | « no previous file | content/public/renderer/document_state.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_ 5 #ifndef CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
6 #define CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_ 6 #define CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 void set_use_error_page(bool use_error_page) { 190 void set_use_error_page(bool use_error_page) {
191 use_error_page_ = use_error_page; 191 use_error_page_ = use_error_page;
192 } 192 }
193 193
194 // True if the user agent was overridden for this page. 194 // True if the user agent was overridden for this page.
195 bool is_overriding_user_agent() const { return is_overriding_user_agent_; } 195 bool is_overriding_user_agent() const { return is_overriding_user_agent_; }
196 void set_is_overriding_user_agent(bool state) { 196 void set_is_overriding_user_agent(bool state) {
197 is_overriding_user_agent_ = state; 197 is_overriding_user_agent_ = state;
198 } 198 }
199 199
200 // True if we have to reset the scroll and scale state of the page
201 // after the provisional load has been committed.
202 bool must_reset_scroll_and_scale_state() const {
203 return must_reset_scroll_and_scale_state_;
204 }
205 void set_must_reset_scroll_and_scale_state(bool state) {
206 must_reset_scroll_and_scale_state_ = state;
207 }
208
200 void set_was_prefetcher(bool value) { was_prefetcher_ = value; } 209 void set_was_prefetcher(bool value) { was_prefetcher_ = value; }
201 bool was_prefetcher() const { return was_prefetcher_; } 210 bool was_prefetcher() const { return was_prefetcher_; }
202 211
203 void set_was_referred_by_prefetcher(bool value) { 212 void set_was_referred_by_prefetcher(bool value) {
204 was_referred_by_prefetcher_ = value; 213 was_referred_by_prefetcher_ = value;
205 } 214 }
206 bool was_referred_by_prefetcher() const { 215 bool was_referred_by_prefetcher() const {
207 return was_referred_by_prefetcher_; 216 return was_referred_by_prefetcher_;
208 } 217 }
209 218
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 bool was_fetched_via_proxy_; 281 bool was_fetched_via_proxy_;
273 282
274 GURL searchable_form_url_; 283 GURL searchable_form_url_;
275 std::string searchable_form_encoding_; 284 std::string searchable_form_encoding_;
276 scoped_ptr<webkit::forms::PasswordForm> password_form_data_; 285 scoped_ptr<webkit::forms::PasswordForm> password_form_data_;
277 std::string security_info_; 286 std::string security_info_;
278 287
279 bool use_error_page_; 288 bool use_error_page_;
280 289
281 bool is_overriding_user_agent_; 290 bool is_overriding_user_agent_;
291 bool must_reset_scroll_and_scale_state_;
282 292
283 // A prefetcher is a page that contains link rel=prefetch elements. 293 // A prefetcher is a page that contains link rel=prefetch elements.
284 bool was_prefetcher_; 294 bool was_prefetcher_;
285 bool was_referred_by_prefetcher_; 295 bool was_referred_by_prefetcher_;
286 296
287 LoadType load_type_; 297 LoadType load_type_;
288 298
289 bool cache_policy_override_set_; 299 bool cache_policy_override_set_;
290 WebKit::WebURLRequest::CachePolicy cache_policy_override_; 300 WebKit::WebURLRequest::CachePolicy cache_policy_override_;
291 301
292 bool referrer_policy_set_; 302 bool referrer_policy_set_;
293 WebKit::WebReferrerPolicy referrer_policy_; 303 WebKit::WebReferrerPolicy referrer_policy_;
294 304
295 scoped_ptr<webkit_glue::AltErrorPageResourceFetcher> alt_error_page_fetcher_; 305 scoped_ptr<webkit_glue::AltErrorPageResourceFetcher> alt_error_page_fetcher_;
296 306
297 scoped_ptr<NavigationState> navigation_state_; 307 scoped_ptr<NavigationState> navigation_state_;
298 }; 308 };
299 309
300 #endif // CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_ 310 #endif // CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
301 311
302 } // namespace content 312 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/public/renderer/document_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698