Chromium Code Reviews| 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 #include "content/browser/frame_host/render_frame_host_impl.h" | 5 #include "content/browser/frame_host/render_frame_host_impl.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/containers/hash_tables.h" | 9 #include "base/containers/hash_tables.h" |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 915 // DidCommitProvisionalLoad IPC without a prior DidStartProvisionalLoad | 915 // DidCommitProvisionalLoad IPC without a prior DidStartProvisionalLoad |
| 916 // message. | 916 // message. |
| 917 if (!navigation_handle_) { | 917 if (!navigation_handle_) { |
| 918 navigation_handle_ = NavigationHandleImpl::Create( | 918 navigation_handle_ = NavigationHandleImpl::Create( |
| 919 validated_params.url, frame_tree_node_); | 919 validated_params.url, frame_tree_node_); |
| 920 } | 920 } |
| 921 | 921 |
| 922 accessibility_reset_count_ = 0; | 922 accessibility_reset_count_ = 0; |
| 923 frame_tree_node()->navigator()->DidNavigate(this, validated_params); | 923 frame_tree_node()->navigator()->DidNavigate(this, validated_params); |
| 924 | 924 |
| 925 frame_tree_->TraceSnapshot(); | |
|
clamy
2015/10/13 11:48:17
I would rather have this execute inside NavigatorI
benjhayden
2015/10/22 17:24:21
I put it after the !did_navigate early return, but
nasko
2015/10/23 15:52:04
Now that I think about this. Why do we need to hoo
| |
| 926 | |
| 925 // For a top-level frame, there are potential security concerns associated | 927 // For a top-level frame, there are potential security concerns associated |
| 926 // with displaying graphics from a previously loaded page after the URL in | 928 // with displaying graphics from a previously loaded page after the URL in |
| 927 // the omnibar has been changed. It is unappealing to clear the page | 929 // the omnibar has been changed. It is unappealing to clear the page |
| 928 // immediately, but if the renderer is taking a long time to issue any | 930 // immediately, but if the renderer is taking a long time to issue any |
| 929 // compositor output (possibly because of script deliberately creating this | 931 // compositor output (possibly because of script deliberately creating this |
| 930 // situation) then we clear it after a while anyway. | 932 // situation) then we clear it after a while anyway. |
| 931 // See https://crbug.com/497588. | 933 // See https://crbug.com/497588. |
| 932 if (frame_tree_node_->IsMainFrame() && GetView() && | 934 if (frame_tree_node_->IsMainFrame() && GetView() && |
| 933 !validated_params.was_within_same_page) { | 935 !validated_params.was_within_same_page) { |
| 934 RenderWidgetHostImpl::From(GetView()->GetRenderWidgetHost()) | 936 RenderWidgetHostImpl::From(GetView()->GetRenderWidgetHost()) |
| (...skipping 1332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2267 BrowserPluginInstanceIDToAXTreeID(value))); | 2269 BrowserPluginInstanceIDToAXTreeID(value))); |
| 2268 break; | 2270 break; |
| 2269 case AX_CONTENT_INT_ATTRIBUTE_LAST: | 2271 case AX_CONTENT_INT_ATTRIBUTE_LAST: |
| 2270 NOTREACHED(); | 2272 NOTREACHED(); |
| 2271 break; | 2273 break; |
| 2272 } | 2274 } |
| 2273 } | 2275 } |
| 2274 } | 2276 } |
| 2275 | 2277 |
| 2276 } // namespace content | 2278 } // namespace content |
| OLD | NEW |