| OLD | NEW |
| 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 <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 951 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 962 // The pending WebUIImpl and its type. These values will be used exclusively | 962 // The pending WebUIImpl and its type. These values will be used exclusively |
| 963 // for same-site navigations to keep a transition of a WebUI in a pending | 963 // for same-site navigations to keep a transition of a WebUI in a pending |
| 964 // state until the navigation commits. | 964 // state until the navigation commits. |
| 965 scoped_ptr<WebUIImpl> pending_web_ui_; | 965 scoped_ptr<WebUIImpl> pending_web_ui_; |
| 966 WebUI::TypeID pending_web_ui_type_; | 966 WebUI::TypeID pending_web_ui_type_; |
| 967 | 967 |
| 968 // If true the associated WebUI should be reused when CommitPendingWebUI is | 968 // If true the associated WebUI should be reused when CommitPendingWebUI is |
| 969 // called (no pending instance should be set). | 969 // called (no pending instance should be set). |
| 970 bool should_reuse_web_ui_; | 970 bool should_reuse_web_ui_; |
| 971 | 971 |
| 972 // True if the RenderFrameHost is in the process of committing a navigation. | |
| 973 // This is temporary to help pinpoint the cause of crbug.com/589365. | |
| 974 // TODO(clamy): Remove once enough data has been gathered. | |
| 975 bool is_in_commit_; | |
| 976 | |
| 977 // PlzNavigate: The LoFi state of the last navigation. This is used during | 972 // PlzNavigate: The LoFi state of the last navigation. This is used during |
| 978 // history navigation of subframes to ensure that subframes navigate with the | 973 // history navigation of subframes to ensure that subframes navigate with the |
| 979 // same LoFi status as the top-level frame. | 974 // same LoFi status as the top-level frame. |
| 980 LoFiState last_navigation_lofi_state_; | 975 LoFiState last_navigation_lofi_state_; |
| 981 | 976 |
| 982 // NOTE: This must be the last member. | 977 // NOTE: This must be the last member. |
| 983 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; | 978 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; |
| 984 | 979 |
| 985 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); | 980 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); |
| 986 }; | 981 }; |
| 987 | 982 |
| 988 } // namespace content | 983 } // namespace content |
| 989 | 984 |
| 990 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ | 985 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ |
| OLD | NEW |