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 924 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
935 // The pending WebUIImpl and its type. These values will be used exclusively | 935 // The pending WebUIImpl and its type. These values will be used exclusively |
936 // for same-site navigations to keep a transition of a WebUI in a pending | 936 // for same-site navigations to keep a transition of a WebUI in a pending |
937 // state until the navigation commits. | 937 // state until the navigation commits. |
938 scoped_ptr<WebUIImpl> pending_web_ui_; | 938 scoped_ptr<WebUIImpl> pending_web_ui_; |
939 WebUI::TypeID pending_web_ui_type_; | 939 WebUI::TypeID pending_web_ui_type_; |
940 | 940 |
941 // If true the associated WebUI should be reused when CommitPendingWebUI is | 941 // If true the associated WebUI should be reused when CommitPendingWebUI is |
942 // called (no pending instance should be set). | 942 // called (no pending instance should be set). |
943 bool should_reuse_web_ui_; | 943 bool should_reuse_web_ui_; |
944 | 944 |
| 945 // True if the RenderFrameHost is in the process of committing a navigation. |
| 946 // This is temporary to help pinpoint the cause of crbug.com/589365. |
| 947 // TODO(clamy): Remove once enough data has been gathered. |
| 948 bool is_in_commit_; |
| 949 |
945 // NOTE: This must be the last member. | 950 // NOTE: This must be the last member. |
946 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; | 951 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; |
947 | 952 |
948 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); | 953 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); |
949 }; | 954 }; |
950 | 955 |
951 } // namespace content | 956 } // namespace content |
952 | 957 |
953 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ | 958 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ |
OLD | NEW |