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

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

Issue 133073021: Pass DomContentLoaded event from prerenders to launching elements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the test. 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
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_contents.h" 5 #include "chrome/browser/prerender/prerender_contents.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 } 178 }
179 179
180 private: 180 private:
181 PrerenderContents* prerender_contents_; 181 PrerenderContents* prerender_contents_;
182 }; 182 };
183 183
184 void PrerenderContents::Observer::OnPrerenderStopLoading( 184 void PrerenderContents::Observer::OnPrerenderStopLoading(
185 PrerenderContents* contents) { 185 PrerenderContents* contents) {
186 } 186 }
187 187
188 void PrerenderContents::Observer::OnPrerenderDomContentLoaded(
189 PrerenderContents* contents) {
190 }
191
188 void PrerenderContents::Observer::OnPrerenderCreatedMatchCompleteReplacement( 192 void PrerenderContents::Observer::OnPrerenderCreatedMatchCompleteReplacement(
189 PrerenderContents* contents, PrerenderContents* replacement) { 193 PrerenderContents* contents, PrerenderContents* replacement) {
190 } 194 }
191 195
192 PrerenderContents::Observer::Observer() { 196 PrerenderContents::Observer::Observer() {
193 } 197 }
194 198
195 PrerenderContents::Observer::~Observer() { 199 PrerenderContents::Observer::~Observer() {
196 } 200 }
197 201
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 482
479 void PrerenderContents::NotifyPrerenderStart() { 483 void PrerenderContents::NotifyPrerenderStart() {
480 DCHECK_EQ(FINAL_STATUS_MAX, final_status_); 484 DCHECK_EQ(FINAL_STATUS_MAX, final_status_);
481 FOR_EACH_OBSERVER(Observer, observer_list_, OnPrerenderStart(this)); 485 FOR_EACH_OBSERVER(Observer, observer_list_, OnPrerenderStart(this));
482 } 486 }
483 487
484 void PrerenderContents::NotifyPrerenderStopLoading() { 488 void PrerenderContents::NotifyPrerenderStopLoading() {
485 FOR_EACH_OBSERVER(Observer, observer_list_, OnPrerenderStopLoading(this)); 489 FOR_EACH_OBSERVER(Observer, observer_list_, OnPrerenderStopLoading(this));
486 } 490 }
487 491
492 void PrerenderContents::NotifyPrerenderDomContentLoaded() {
493 FOR_EACH_OBSERVER(Observer, observer_list_,
494 OnPrerenderDomContentLoaded(this));
495 }
496
488 void PrerenderContents::NotifyPrerenderStop() { 497 void PrerenderContents::NotifyPrerenderStop() {
489 DCHECK_NE(FINAL_STATUS_MAX, final_status_); 498 DCHECK_NE(FINAL_STATUS_MAX, final_status_);
490 FOR_EACH_OBSERVER(Observer, observer_list_, OnPrerenderStop(this)); 499 FOR_EACH_OBSERVER(Observer, observer_list_, OnPrerenderStop(this));
491 observer_list_.Clear(); 500 observer_list_.Clear();
492 } 501 }
493 502
494 void PrerenderContents::NotifyPrerenderCreatedMatchCompleteReplacement( 503 void PrerenderContents::NotifyPrerenderCreatedMatchCompleteReplacement(
495 PrerenderContents* replacement) { 504 PrerenderContents* replacement) {
496 FOR_EACH_OBSERVER(Observer, observer_list_, 505 FOR_EACH_OBSERVER(Observer, observer_list_,
497 OnPrerenderCreatedMatchCompleteReplacement(this, 506 OnPrerenderCreatedMatchCompleteReplacement(this,
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
579 render_frame_host->Send(new PrerenderMsg_SetIsPrerendering( 588 render_frame_host->Send(new PrerenderMsg_SetIsPrerendering(
580 render_frame_host->GetRoutingID(), true)); 589 render_frame_host->GetRoutingID(), true));
581 } 590 }
582 591
583 void PrerenderContents::DidStopLoading( 592 void PrerenderContents::DidStopLoading(
584 content::RenderViewHost* render_view_host) { 593 content::RenderViewHost* render_view_host) {
585 has_stopped_loading_ = true; 594 has_stopped_loading_ = true;
586 NotifyPrerenderStopLoading(); 595 NotifyPrerenderStopLoading();
587 } 596 }
588 597
598 void PrerenderContents::DocumentLoadedInFrame(
599 int64 frame_id,
600 RenderViewHost* render_view_host) {
601 NotifyPrerenderDomContentLoaded();
davidben 2014/02/10 18:22:07 Won't this fire for every frame? I expect you want
ksimbili 2014/02/11 01:03:58 Done.
602 }
603
589 void PrerenderContents::DidStartProvisionalLoadForFrame( 604 void PrerenderContents::DidStartProvisionalLoadForFrame(
590 int64 frame_id, 605 int64 frame_id,
591 int64 parent_frame_id, 606 int64 parent_frame_id,
592 bool is_main_frame, 607 bool is_main_frame,
593 const GURL& validated_url, 608 const GURL& validated_url,
594 bool is_error_page, 609 bool is_error_page,
595 bool is_iframe_srcdoc, 610 bool is_iframe_srcdoc,
596 RenderViewHost* render_view_host) { 611 RenderViewHost* render_view_host) {
597 if (is_main_frame) { 612 if (is_main_frame) {
598 if (!CheckURL(validated_url)) 613 if (!CheckURL(validated_url))
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
828 DCHECK_GE(cookie_status_, 0); 843 DCHECK_GE(cookie_status_, 0);
829 DCHECK_LT(cookie_status_, kNumCookieStatuses); 844 DCHECK_LT(cookie_status_, kNumCookieStatuses);
830 } 845 }
831 846
832 void PrerenderContents::AddResourceThrottle( 847 void PrerenderContents::AddResourceThrottle(
833 const base::WeakPtr<PrerenderResourceThrottle>& throttle) { 848 const base::WeakPtr<PrerenderResourceThrottle>& throttle) {
834 resource_throttles_.push_back(throttle); 849 resource_throttles_.push_back(throttle);
835 } 850 }
836 851
837 } // namespace prerender 852 } // namespace prerender
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_contents.h ('k') | chrome/browser/prerender/prerender_handle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698