Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / prerender / prerender_handle.cc

diff --git a/src/chrome/browser/prerender/prerender_handle.cc b/src/chrome/browser/prerender/prerender_handle.cc
index 31791dc..17b2583 100644 (file)
--- a/src/chrome/browser/prerender/prerender_handle.cc
+++ b/src/chrome/browser/prerender/prerender_handle.cc
@@ -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) {
   DCHECK(CalledOnValidThread());
   DCHECK(prerender_data_.get());
@@ -115,6 +94,15 @@ void PrerenderHandle::OnPrerenderStopLoading(
     observer_->OnPrerenderStopLoading(this);
 }
 
+void PrerenderHandle::OnPrerenderDomContentLoaded(
+    PrerenderContents* prerender_contents) {
+  DCHECK(CalledOnValidThread());
+  DCHECK(prerender_data_.get());
+  DCHECK_EQ(prerender_data_->contents(), prerender_contents);
+  if (observer_)
+    observer_->OnPrerenderDomContentLoaded(this);
+}
+
 void PrerenderHandle::OnPrerenderStop(PrerenderContents* prerender_contents) {
   DCHECK(CalledOnValidThread());
   if (observer_)