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

Side by Side Diff: chrome/browser/prerender/prerender_handle.cc

Issue 165223005: Remove AdoptPrerenderDataFrom. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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) 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 #include "chrome/browser/prerender/prerender_handle.h" 5 #include "chrome/browser/prerender/prerender_handle.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/browser/prerender/prerender_contents.h" 10 #include "chrome/browser/prerender/prerender_contents.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 PrerenderHandle::PrerenderHandle( 70 PrerenderHandle::PrerenderHandle(
71 PrerenderManager::PrerenderData* prerender_data) 71 PrerenderManager::PrerenderData* prerender_data)
72 : observer_(NULL), 72 : observer_(NULL),
73 weak_ptr_factory_(this) { 73 weak_ptr_factory_(this) {
74 if (prerender_data) { 74 if (prerender_data) {
75 prerender_data_ = prerender_data->AsWeakPtr(); 75 prerender_data_ = prerender_data->AsWeakPtr();
76 prerender_data->OnHandleCreated(this); 76 prerender_data->OnHandleCreated(this);
77 } 77 }
78 } 78 }
79 79
80 void PrerenderHandle::AdoptPrerenderDataFrom(PrerenderHandle* other_handle) {
81 DCHECK_EQ(static_cast<PrerenderManager::PrerenderData*>(NULL),
82 prerender_data_.get());
83 if (other_handle->prerender_data_.get() &&
84 other_handle->prerender_data_->contents()) {
85 other_handle->prerender_data_->contents()->RemoveObserver(other_handle);
86 }
87
88 prerender_data_ = other_handle->prerender_data_;
89 other_handle->prerender_data_.reset();
90
91 if (prerender_data_.get()) {
92 DCHECK_NE(static_cast<PrerenderContents*>(NULL),
93 prerender_data_->contents());
94 prerender_data_->contents()->AddObserver(this);
95 // We are joining a prerender that has already started so we fire off an
96 // extra start event at ourselves.
97 OnPrerenderStart(prerender_data_->contents());
98 }
99 }
100
101 void PrerenderHandle::OnPrerenderStart(PrerenderContents* prerender_contents) { 80 void PrerenderHandle::OnPrerenderStart(PrerenderContents* prerender_contents) {
102 DCHECK(CalledOnValidThread()); 81 DCHECK(CalledOnValidThread());
103 DCHECK(prerender_data_.get()); 82 DCHECK(prerender_data_.get());
104 DCHECK_EQ(prerender_data_->contents(), prerender_contents); 83 DCHECK_EQ(prerender_data_->contents(), prerender_contents);
105 if (observer_) 84 if (observer_)
106 observer_->OnPrerenderStart(this); 85 observer_->OnPrerenderStart(this);
107 } 86 }
108 87
109 void PrerenderHandle::OnPrerenderStopLoading( 88 void PrerenderHandle::OnPrerenderStopLoading(
110 PrerenderContents* prerender_contents) { 89 PrerenderContents* prerender_contents) {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 return prerender_data_->contents()->GetSessionStorageNamespace(); 138 return prerender_data_->contents()->GetSessionStorageNamespace();
160 } 139 }
161 140
162 int PrerenderHandle::GetChildId() const { 141 int PrerenderHandle::GetChildId() const {
163 if (!prerender_data_.get()) 142 if (!prerender_data_.get())
164 return -1; 143 return -1;
165 return prerender_data_->contents()->child_id(); 144 return prerender_data_->contents()->child_id();
166 } 145 }
167 146
168 } // namespace prerender 147 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_handle.h ('k') | chrome/browser/prerender/prerender_link_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698