diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 17:50:18 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-24 17:50:18 +0000 |
| commit | 987d51af86cf27ef03c4f57a643fe77455a9a63d (patch) | |
| tree | 481d6e4ace97f81bea712b49ee6ee4b3490f0db8 /chrome/renderer/navigation_state.cc | |
| parent | 567812dd45d36e093554664bdbd4284a9670a8b3 (diff) | |
| download | chromium_src-987d51af86cf27ef03c4f57a643fe77455a9a63d.zip chromium_src-987d51af86cf27ef03c4f57a643fe77455a9a63d.tar.gz chromium_src-987d51af86cf27ef03c4f57a643fe77455a9a63d.tar.bz2 | |
The RenderView currently only updates the navigation state
for the currently displayed data source in
OnDisplayPrerenderedPage. If there's a provisional data
source, it still thinks its being prerendered when it
becomes the main data source.
This CL fixes that issue. To do this, it moves the
|is_prerendering_| flag over to the RenderView. While
not a strictly necessary design change, things are a bit
less bug-prone this way.
Also changes how |was_started_as_prerender| is set.
BUG=73173
TEST=none, yet
(manual test: Go to http://peter.sh and refresh it a few times, with prerender enabled and a debug build. Notice lack of DCHECK assertion in OnDisplayPrerenderedPage)
Review URL: http://codereview.chromium.org/6532031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/navigation_state.cc')
| -rw-r--r-- | chrome/renderer/navigation_state.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/renderer/navigation_state.cc b/chrome/renderer/navigation_state.cc index dfa9f84..57be7eb 100644 --- a/chrome/renderer/navigation_state.cc +++ b/chrome/renderer/navigation_state.cc @@ -39,14 +39,6 @@ void NavigationState::set_alt_error_page_fetcher( alt_error_page_fetcher_.reset(f); } -bool NavigationState::is_prerendering() const { - return is_prerendering_; -} - -void NavigationState::set_is_prerendering(bool is_prerendering) { - is_prerendering_ = is_prerendering; -} - bool NavigationState::was_started_as_prerender() const { return was_started_as_prerender_; } @@ -72,7 +64,6 @@ NavigationState::NavigationState(PageTransition::Type transition_type, pending_page_id_(pending_page_id), pending_history_list_offset_(pending_history_list_offset), use_error_page_(false), - is_prerendering_(false), was_started_as_prerender_(false), cache_policy_override_set_(false), cache_policy_override_(WebKit::WebURLRequest::UseProtocolCachePolicy), |