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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/containers/hash_tables.h" | 10 #include "base/containers/hash_tables.h" |
| (...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1005 // navigation. | 1005 // navigation. |
| 1006 if (navigation_handle_ && | 1006 if (navigation_handle_ && |
| 1007 navigation_handle_->GetURL() != validated_params.url) { | 1007 navigation_handle_->GetURL() != validated_params.url) { |
| 1008 navigation_handle_.reset(); | 1008 navigation_handle_.reset(); |
| 1009 } | 1009 } |
| 1010 | 1010 |
| 1011 // Synchronous renderer-initiated navigations will send a | 1011 // Synchronous renderer-initiated navigations will send a |
| 1012 // DidCommitProvisionalLoad IPC without a prior DidStartProvisionalLoad | 1012 // DidCommitProvisionalLoad IPC without a prior DidStartProvisionalLoad |
| 1013 // message. | 1013 // message. |
| 1014 if (!navigation_handle_) { | 1014 if (!navigation_handle_) { |
| 1015 navigation_handle_ = NavigationHandleImpl::Create( | 1015 navigation_handle_ = |
| 1016 validated_params.url, frame_tree_node_, base::TimeTicks::Now()); | 1016 NavigationHandleImpl::Create(validated_params.url, frame_tree_node_, |
| 1017 true, // is_synchronous | |
|
Charlie Reis
2016/02/04 20:46:04
Is it safe to conclude this? Above, we clear the
nasko
2016/02/04 23:36:59
Based on the comments of the two blocks, it seems
Charlie Reis
2016/02/05 18:09:40
Acknowledged.
| |
| 1018 false, // is_srcdoc | |
|
Charlie Reis
2016/02/04 20:46:04
Is it possible for srcdoc to come through this pat
nasko
2016/02/04 23:36:59
I don't think srcdoc is synchronous. We do get Did
Charlie Reis
2016/02/05 18:09:41
Ok, thanks.
| |
| 1019 base::TimeTicks::Now()); | |
| 1017 } | 1020 } |
| 1018 | 1021 |
| 1019 accessibility_reset_count_ = 0; | 1022 accessibility_reset_count_ = 0; |
| 1020 frame_tree_node()->navigator()->DidNavigate(this, validated_params); | 1023 frame_tree_node()->navigator()->DidNavigate(this, validated_params); |
| 1021 | 1024 |
| 1022 // For a top-level frame, there are potential security concerns associated | 1025 // For a top-level frame, there are potential security concerns associated |
| 1023 // with displaying graphics from a previously loaded page after the URL in | 1026 // with displaying graphics from a previously loaded page after the URL in |
| 1024 // the omnibar has been changed. It is unappealing to clear the page | 1027 // the omnibar has been changed. It is unappealing to clear the page |
| 1025 // immediately, but if the renderer is taking a long time to issue any | 1028 // immediately, but if the renderer is taking a long time to issue any |
| 1026 // compositor output (possibly because of script deliberately creating this | 1029 // compositor output (possibly because of script deliberately creating this |
| (...skipping 1523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2550 *dst = src; | 2553 *dst = src; |
| 2551 | 2554 |
| 2552 if (src.routing_id != -1) | 2555 if (src.routing_id != -1) |
| 2553 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); | 2556 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); |
| 2554 | 2557 |
| 2555 if (src.parent_routing_id != -1) | 2558 if (src.parent_routing_id != -1) |
| 2556 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); | 2559 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); |
| 2557 } | 2560 } |
| 2558 | 2561 |
| 2559 } // namespace content | 2562 } // namespace content |
| OLD | NEW |