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 4388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4399 observers_.RemoveObserver(observer); | 4399 observers_.RemoveObserver(observer); |
4400 } | 4400 } |
4401 | 4401 |
4402 void RenderFrameImpl::OnStop() { | 4402 void RenderFrameImpl::OnStop() { |
4403 DCHECK(frame_); | 4403 DCHECK(frame_); |
4404 frame_->stopLoading(); | 4404 frame_->stopLoading(); |
4405 if (!frame_->parent()) | 4405 if (!frame_->parent()) |
4406 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers_, OnStop()); | 4406 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers_, OnStop()); |
4407 | 4407 |
4408 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnStop()); | 4408 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, OnStop()); |
| 4409 // frame_->stopLoadingCheckCompletedNow(); |
4409 } | 4410 } |
4410 | 4411 |
4411 void RenderFrameImpl::WasHidden() { | 4412 void RenderFrameImpl::WasHidden() { |
4412 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, WasHidden()); | 4413 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, WasHidden()); |
4413 } | 4414 } |
4414 | 4415 |
4415 void RenderFrameImpl::WasShown() { | 4416 void RenderFrameImpl::WasShown() { |
4416 // TODO(kenrb): Need to figure out how to do this better. Should | 4417 // TODO(kenrb): Need to figure out how to do this better. Should |
4417 // VisibilityState remain a page-level concept or move to frames? | 4418 // VisibilityState remain a page-level concept or move to frames? |
4418 // The semantics of 'Show' might have to change here. | 4419 // The semantics of 'Show' might have to change here. |
(...skipping 1703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6122 int match_count, | 6123 int match_count, |
6123 int ordinal, | 6124 int ordinal, |
6124 const WebRect& selection_rect, | 6125 const WebRect& selection_rect, |
6125 bool final_status_update) { | 6126 bool final_status_update) { |
6126 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, | 6127 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, |
6127 selection_rect, ordinal, | 6128 selection_rect, ordinal, |
6128 final_status_update)); | 6129 final_status_update)); |
6129 } | 6130 } |
6130 | 6131 |
6131 } // namespace content | 6132 } // namespace content |
OLD | NEW |