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

Side by Side Diff: chrome/browser/prerender/prerender_contents.h

Issue 7017014: Fix issues when PrerenderContents::Destroy() is called during TabContents destruction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Sync Created 9 years, 7 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_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
6 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 6 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 std::vector<GURL> alias_urls_; 330 std::vector<GURL> alias_urls_;
331 331
332 bool has_stopped_loading_; 332 bool has_stopped_loading_;
333 333
334 // This must be the same value as the PrerenderTracker has recorded for 334 // This must be the same value as the PrerenderTracker has recorded for
335 // |this|, when |this| has a RenderView. 335 // |this|, when |this| has a RenderView.
336 FinalStatus final_status_; 336 FinalStatus final_status_;
337 337
338 bool prerendering_has_started_; 338 bool prerendering_has_started_;
339 339
340 // Tracks whether or not prerendering has been cancelled by calling Destroy.
341 // Used solely to prevent double deletion.
342 bool prerendering_has_been_cancelled_;
343
340 // Time at which we started to load the URL. This is used to compute 344 // Time at which we started to load the URL. This is used to compute
341 // the time elapsed from initiating a prerender until the time the 345 // the time elapsed from initiating a prerender until the time the
342 // (potentially only partially) prerendered page is shown to the user. 346 // (potentially only partially) prerendered page is shown to the user.
343 base::TimeTicks load_start_time_; 347 base::TimeTicks load_start_time_;
344 348
345 // Process Metrics of the render process associated with the 349 // Process Metrics of the render process associated with the
346 // RenderViewHost for this object. 350 // RenderViewHost for this object.
347 scoped_ptr<base::ProcessMetrics> process_metrics_; 351 scoped_ptr<base::ProcessMetrics> process_metrics_;
348 352
349 // The prerendered TabContents; may be null. 353 // The prerendered TabContents; may be null.
350 scoped_ptr<TabContentsWrapper> prerender_contents_; 354 scoped_ptr<TabContentsWrapper> prerender_contents_;
351 355
352 scoped_ptr<PrerenderRenderViewHostObserver> render_view_host_observer_; 356 scoped_ptr<PrerenderRenderViewHostObserver> render_view_host_observer_;
353 357
354 scoped_ptr<TabContentsDelegateImpl> tab_contents_delegate_; 358 scoped_ptr<TabContentsDelegateImpl> tab_contents_delegate_;
355 359
356 // These are -1 before a RenderView is created. 360 // These are -1 before a RenderView is created.
357 int child_id_; 361 int child_id_;
358 int route_id_; 362 int route_id_;
359 363
360 DISALLOW_COPY_AND_ASSIGN(PrerenderContents); 364 DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
361 }; 365 };
362 366
363 } // namespace prerender 367 } // namespace prerender
364 368
365 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 369 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698