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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 1048463004: PlzNavigate: track pending commits (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments + rebase on top of 1088933003 Created 5 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 // is for closing the entire tab ( = false), or only this RenderFrameHost in 668 // is for closing the entire tab ( = false), or only this RenderFrameHost in
669 // the case of a navigation ( = true). Currently only cross-site navigations 669 // the case of a navigation ( = true). Currently only cross-site navigations
670 // require a beforeUnload/unload ACK. 670 // require a beforeUnload/unload ACK.
671 // PlzNavigate: all navigations require a beforeUnload ACK. 671 // PlzNavigate: all navigations require a beforeUnload ACK.
672 bool unload_ack_is_for_navigation_; 672 bool unload_ack_is_for_navigation_;
673 673
674 // Indicates whether this RenderFrameHost is in the process of loading a 674 // Indicates whether this RenderFrameHost is in the process of loading a
675 // document or not. 675 // document or not.
676 bool is_loading_; 676 bool is_loading_;
677 677
678 // PlzNavigate
679 // Used to track whether a commit is expected in this frame. Only used in
680 // tests.
681 bool pending_commit_;
682
678 // Used to swap out or shut down this RFH when the unload event is taking too 683 // Used to swap out or shut down this RFH when the unload event is taking too
679 // long to execute, depending on the number of active frames in the 684 // long to execute, depending on the number of active frames in the
680 // SiteInstance. 685 // SiteInstance.
681 scoped_ptr<TimeoutMonitor> swapout_event_monitor_timeout_; 686 scoped_ptr<TimeoutMonitor> swapout_event_monitor_timeout_;
682 687
683 scoped_ptr<ServiceRegistryImpl> service_registry_; 688 scoped_ptr<ServiceRegistryImpl> service_registry_;
684 689
685 #if defined(OS_ANDROID) 690 #if defined(OS_ANDROID)
686 scoped_ptr<ServiceRegistryAndroid> service_registry_android_; 691 scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
687 #endif 692 #endif
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 724
720 // NOTE: This must be the last member. 725 // NOTE: This must be the last member.
721 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 726 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
722 727
723 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 728 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
724 }; 729 };
725 730
726 } // namespace content 731 } // namespace content
727 732
728 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 733 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698