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 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1042 // has not been notified about the start of the load yet. Do it now. | 1042 // has not been notified about the start of the load yet. Do it now. |
1043 if (!is_loading()) { | 1043 if (!is_loading()) { |
1044 bool was_loading = frame_tree_node()->frame_tree()->IsLoading(); | 1044 bool was_loading = frame_tree_node()->frame_tree()->IsLoading(); |
1045 is_loading_ = true; | 1045 is_loading_ = true; |
1046 frame_tree_node()->DidStartLoading(true, was_loading); | 1046 frame_tree_node()->DidStartLoading(true, was_loading); |
1047 } | 1047 } |
1048 pending_commit_ = false; | 1048 pending_commit_ = false; |
1049 } | 1049 } |
1050 } | 1050 } |
1051 | 1051 |
1052 CHECK(navigation_handle_); | |
nasko
2016/02/25 16:47:19
I don't see how this will be nullptr. It is tested
clamy
2016/02/26 12:41:02
Removed the check.
| |
1053 CHECK_EQ(navigation_handle_->GetURL(), validated_params.url); | |
nasko
2016/02/25 16:47:19
Same thing here. It is checked on 1026 and if the
clamy
2016/02/26 12:41:02
I know but we're still hitting the check in Naviga
| |
1054 | |
1052 accessibility_reset_count_ = 0; | 1055 accessibility_reset_count_ = 0; |
1053 frame_tree_node()->navigator()->DidNavigate(this, validated_params); | 1056 frame_tree_node()->navigator()->DidNavigate(this, validated_params); |
1054 | 1057 |
1055 // For a top-level frame, there are potential security concerns associated | 1058 // For a top-level frame, there are potential security concerns associated |
1056 // with displaying graphics from a previously loaded page after the URL in | 1059 // with displaying graphics from a previously loaded page after the URL in |
1057 // the omnibar has been changed. It is unappealing to clear the page | 1060 // the omnibar has been changed. It is unappealing to clear the page |
1058 // immediately, but if the renderer is taking a long time to issue any | 1061 // immediately, but if the renderer is taking a long time to issue any |
1059 // compositor output (possibly because of script deliberately creating this | 1062 // compositor output (possibly because of script deliberately creating this |
1060 // situation) then we clear it after a while anyway. | 1063 // situation) then we clear it after a while anyway. |
1061 // See https://crbug.com/497588. | 1064 // See https://crbug.com/497588. |
(...skipping 1537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2599 *dst = src; | 2602 *dst = src; |
2600 | 2603 |
2601 if (src.routing_id != -1) | 2604 if (src.routing_id != -1) |
2602 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); | 2605 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); |
2603 | 2606 |
2604 if (src.parent_routing_id != -1) | 2607 if (src.parent_routing_id != -1) |
2605 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); | 2608 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); |
2606 } | 2609 } |
2607 | 2610 |
2608 } // namespace content | 2611 } // namespace content |
OLD | NEW |