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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 4650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4661 navigation_state->set_transition_type(ui::PAGE_TRANSITION_LINK); | 4661 navigation_state->set_transition_type(ui::PAGE_TRANSITION_LINK); |
4662 } | 4662 } |
4663 | 4663 |
4664 void RenderFrameImpl::didStartLoading(bool to_different_document) { | 4664 void RenderFrameImpl::didStartLoading(bool to_different_document) { |
4665 TRACE_EVENT1("navigation", "RenderFrameImpl::didStartLoading", | 4665 TRACE_EVENT1("navigation", "RenderFrameImpl::didStartLoading", |
4666 "id", routing_id_); | 4666 "id", routing_id_); |
4667 render_view_->FrameDidStartLoading(frame_); | 4667 render_view_->FrameDidStartLoading(frame_); |
4668 Send(new FrameHostMsg_DidStartLoading(routing_id_, to_different_document)); | 4668 Send(new FrameHostMsg_DidStartLoading(routing_id_, to_different_document)); |
4669 } | 4669 } |
4670 | 4670 |
4671 void RenderFrameImpl::didStopLoading() { | 4671 void RenderFrameImpl::didStopLoading(WebLocalFrame* frame) { |
| 4672 DCHECK(!frame_ || frame_ == frame); |
4672 TRACE_EVENT1("navigation", "RenderFrameImpl::didStopLoading", | 4673 TRACE_EVENT1("navigation", "RenderFrameImpl::didStopLoading", |
4673 "id", routing_id_); | 4674 "id", routing_id_); |
4674 render_view_->FrameDidStopLoading(frame_); | 4675 render_view_->FrameDidStopLoading(frame_); |
4675 Send(new FrameHostMsg_DidStopLoading(routing_id_)); | 4676 Send(new FrameHostMsg_DidStopLoading(routing_id_)); |
4676 } | 4677 } |
4677 | 4678 |
4678 void RenderFrameImpl::didChangeLoadProgress(double load_progress) { | 4679 void RenderFrameImpl::didChangeLoadProgress(double load_progress) { |
4679 Send(new FrameHostMsg_DidChangeLoadProgress(routing_id_, load_progress)); | 4680 Send(new FrameHostMsg_DidChangeLoadProgress(routing_id_, load_progress)); |
4680 } | 4681 } |
4681 | 4682 |
(...skipping 1439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6121 int match_count, | 6122 int match_count, |
6122 int ordinal, | 6123 int ordinal, |
6123 const WebRect& selection_rect, | 6124 const WebRect& selection_rect, |
6124 bool final_status_update) { | 6125 bool final_status_update) { |
6125 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6126 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6126 selection_rect, ordinal, | 6127 selection_rect, ordinal, |
6127 final_status_update)); | 6128 final_status_update)); |
6128 } | 6129 } |
6129 | 6130 |
6130 } // namespace content | 6131 } // namespace content |
OLD | NEW |