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

Side by Side Diff: chrome/renderer/render_view.h

Issue 6532031: Fix for swapping in prerendered RenderViews with provisional data sources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Remove some unneeded code Created 9 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CHROME_RENDERER_RENDER_VIEW_H_ 5 #ifndef CHROME_RENDERER_RENDER_VIEW_H_
6 #define CHROME_RENDERER_RENDER_VIEW_H_ 6 #define CHROME_RENDERER_RENDER_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after
1159 1159
1160 // Holds state pertaining to a navigation that we initiated. This is held by 1160 // Holds state pertaining to a navigation that we initiated. This is held by
1161 // the WebDataSource::ExtraData attribute. We use pending_navigation_state_ 1161 // the WebDataSource::ExtraData attribute. We use pending_navigation_state_
1162 // as a temporary holder for the state until the WebDataSource corresponding 1162 // as a temporary holder for the state until the WebDataSource corresponding
1163 // to the new navigation is created. See DidCreateDataSource. 1163 // to the new navigation is created. See DidCreateDataSource.
1164 scoped_ptr<NavigationState> pending_navigation_state_; 1164 scoped_ptr<NavigationState> pending_navigation_state_;
1165 1165
1166 // Timer used to delay the updating of nav state (see SyncNavigationState). 1166 // Timer used to delay the updating of nav state (see SyncNavigationState).
1167 base::OneShotTimer<RenderView> nav_state_sync_timer_; 1167 base::OneShotTimer<RenderView> nav_state_sync_timer_;
1168 1168
1169 // True if the RenderView is currently prerendering a page.
1170 bool is_prerendering_;
1171
1169 // Page IDs ------------------------------------------------------------------ 1172 // Page IDs ------------------------------------------------------------------
1170 // 1173 //
1171 // Page IDs allow the browser to identify pages in each renderer process for 1174 // Page IDs allow the browser to identify pages in each renderer process for
1172 // keeping back/forward history in sync. 1175 // keeping back/forward history in sync.
1173 1176
1174 // ID of the current page. Note that this is NOT updated for every main 1177 // ID of the current page. Note that this is NOT updated for every main
1175 // frame navigation, only for "regular" navigations that go into session 1178 // frame navigation, only for "regular" navigations that go into session
1176 // history. In particular, client redirects, like the page cycler uses 1179 // history. In particular, client redirects, like the page cycler uses
1177 // (document.location.href="foo") do not count as regular navigations and do 1180 // (document.location.href="foo") do not count as regular navigations and do
1178 // not increment the page id. 1181 // not increment the page id.
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
1428 // bunch of stuff, you should probably create a helper class and put your 1431 // bunch of stuff, you should probably create a helper class and put your
1429 // data and methods on that to avoid bloating RenderView more. You can use 1432 // data and methods on that to avoid bloating RenderView more. You can use
1430 // the Observer interface to filter IPC messages and receive frame change 1433 // the Observer interface to filter IPC messages and receive frame change
1431 // notifications. 1434 // notifications.
1432 // --------------------------------------------------------------------------- 1435 // ---------------------------------------------------------------------------
1433 1436
1434 DISALLOW_COPY_AND_ASSIGN(RenderView); 1437 DISALLOW_COPY_AND_ASSIGN(RenderView);
1435 }; 1438 };
1436 1439
1437 #endif // CHROME_RENDERER_RENDER_VIEW_H_ 1440 #endif // CHROME_RENDERER_RENDER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698