| 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/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1005 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1016 | 1016 |
| 1017 void RenderFrameHostImpl::OnDidDropNavigation() { | 1017 void RenderFrameHostImpl::OnDidDropNavigation() { |
| 1018 // At the end of Navigate(), the FrameTreeNode's DidStartLoading is called to | 1018 // At the end of Navigate(), the FrameTreeNode's DidStartLoading is called to |
| 1019 // force the spinner to start, even if the renderer didn't yet begin the load. | 1019 // force the spinner to start, even if the renderer didn't yet begin the load. |
| 1020 // If it turns out that the renderer dropped the navigation, the spinner needs | 1020 // If it turns out that the renderer dropped the navigation, the spinner needs |
| 1021 // to be turned off. | 1021 // to be turned off. |
| 1022 frame_tree_node_->DidStopLoading(); | 1022 frame_tree_node_->DidStopLoading(); |
| 1023 navigation_handle_.reset(); | 1023 navigation_handle_.reset(); |
| 1024 } | 1024 } |
| 1025 | 1025 |
| 1026 void RenderFrameHostImpl::OnUpdateState(const PageState& state) { | 1026 void RenderFrameHostImpl::OnUpdateState(const ExplodedFrameState& state) { |
| 1027 // TODO(creis): Verify the state's ISN matches the last committed FNE. | 1027 // TODO(creis): Verify the state's ISN matches the last committed FNE. |
| 1028 | 1028 |
| 1029 // Without this check, the renderer can trick the browser into using | 1029 // Without this check, the renderer can trick the browser into using |
| 1030 // filenames it can't access in a future session restore. | 1030 // filenames it can't access in a future session restore. |
| 1031 // TODO(creis): Move CanAccessFilesOfPageState to RenderFrameHostImpl. | 1031 // TODO(creis): Move CanAccessFilesOfPageState to RenderFrameHostImpl. |
| 1032 if (!render_view_host_->CanAccessFilesOfPageState(state)) { | 1032 /*if (!render_view_host_->CanAccessFilesOfPageState(state)) { |
| 1033 bad_message::ReceivedBadMessage( | 1033 bad_message::ReceivedBadMessage( |
| 1034 GetProcess(), bad_message::RFH_CAN_ACCESS_FILES_OF_PAGE_STATE); | 1034 GetProcess(), bad_message::RFH_CAN_ACCESS_FILES_OF_PAGE_STATE); |
| 1035 return; | 1035 return; |
| 1036 } | 1036 }*/ |
| 1037 | 1037 |
| 1038 delegate_->UpdateStateForFrame(this, state); | 1038 delegate_->UpdateStateForFrame(this, state); |
| 1039 } | 1039 } |
| 1040 | 1040 |
| 1041 RenderWidgetHostImpl* RenderFrameHostImpl::GetRenderWidgetHost() { | 1041 RenderWidgetHostImpl* RenderFrameHostImpl::GetRenderWidgetHost() { |
| 1042 return render_widget_host_; | 1042 return render_widget_host_; |
| 1043 } | 1043 } |
| 1044 | 1044 |
| 1045 RenderWidgetHostView* RenderFrameHostImpl::GetView() { | 1045 RenderWidgetHostView* RenderFrameHostImpl::GetView() { |
| 1046 RenderFrameHostImpl* frame = this; | 1046 RenderFrameHostImpl* frame = this; |
| (...skipping 1456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2503 *dst = src; | 2503 *dst = src; |
| 2504 | 2504 |
| 2505 if (src.routing_id != -1) | 2505 if (src.routing_id != -1) |
| 2506 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); | 2506 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); |
| 2507 | 2507 |
| 2508 if (src.parent_routing_id != -1) | 2508 if (src.parent_routing_id != -1) |
| 2509 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); | 2509 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); |
| 2510 } | 2510 } |
| 2511 | 2511 |
| 2512 } // namespace content | 2512 } // namespace content |
| OLD | NEW |