Commit 540125c4 authored by davidben@chromium.org's avatar davidben@chromium.org

Remove AdoptPrerenderDataFrom.

Dead code. It became unused in https://codereview.chromium.org/146983002.

BUG=none

Review URL: https://codereview.chromium.org/165223005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251267 0039d316-1c4b-4281-b951-d872f2087c98
parent fc3c01bf
...@@ -77,27 +77,6 @@ PrerenderHandle::PrerenderHandle( ...@@ -77,27 +77,6 @@ PrerenderHandle::PrerenderHandle(
} }
} }
void PrerenderHandle::AdoptPrerenderDataFrom(PrerenderHandle* other_handle) {
DCHECK_EQ(static_cast<PrerenderManager::PrerenderData*>(NULL),
prerender_data_.get());
if (other_handle->prerender_data_.get() &&
other_handle->prerender_data_->contents()) {
other_handle->prerender_data_->contents()->RemoveObserver(other_handle);
}
prerender_data_ = other_handle->prerender_data_;
other_handle->prerender_data_.reset();
if (prerender_data_.get()) {
DCHECK_NE(static_cast<PrerenderContents*>(NULL),
prerender_data_->contents());
prerender_data_->contents()->AddObserver(this);
// We are joining a prerender that has already started so we fire off an
// extra start event at ourselves.
OnPrerenderStart(prerender_data_->contents());
}
}
void PrerenderHandle::OnPrerenderStart(PrerenderContents* prerender_contents) { void PrerenderHandle::OnPrerenderStart(PrerenderContents* prerender_contents) {
DCHECK(CalledOnValidThread()); DCHECK(CalledOnValidThread());
DCHECK(prerender_data_.get()); DCHECK(prerender_data_.get());
......
...@@ -99,8 +99,6 @@ class PrerenderHandle : public base::NonThreadSafe, ...@@ -99,8 +99,6 @@ class PrerenderHandle : public base::NonThreadSafe,
explicit PrerenderHandle(PrerenderManager::PrerenderData* prerender_data); explicit PrerenderHandle(PrerenderManager::PrerenderData* prerender_data);
void AdoptPrerenderDataFrom(PrerenderHandle* other_handle);
// From PrerenderContents::Observer: // From PrerenderContents::Observer:
virtual void OnPrerenderStart(PrerenderContents* prerender_contents) OVERRIDE; virtual void OnPrerenderStart(PrerenderContents* prerender_contents) OVERRIDE;
virtual void OnPrerenderStopLoading(PrerenderContents* prerender_contents) virtual void OnPrerenderStopLoading(PrerenderContents* prerender_contents)
......
...@@ -476,9 +476,7 @@ void PrerenderLinkManager::Shutdown() { ...@@ -476,9 +476,7 @@ void PrerenderLinkManager::Shutdown() {
has_shutdown_ = true; has_shutdown_ = true;
} }
// In practice, this is always called from either // In practice, this is always called from PrerenderLinkManager::OnAddPrerender.
// PrerenderLinkManager::OnAddPrerender in the regular case, or in the pending
// prerender case, from PrerenderHandle::AdoptPrerenderDataFrom.
void PrerenderLinkManager::OnPrerenderStart( void PrerenderLinkManager::OnPrerenderStart(
PrerenderHandle* prerender_handle) { PrerenderHandle* prerender_handle) {
LinkPrerender* prerender = FindByPrerenderHandle(prerender_handle); LinkPrerender* prerender = FindByPrerenderHandle(prerender_handle);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment