| 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 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 2563 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2574 DVLOG(1) << "didStartLoading called while loading"; | 2574 DVLOG(1) << "didStartLoading called while loading"; |
| 2575 return; | 2575 return; |
| 2576 } | 2576 } |
| 2577 | 2577 |
| 2578 is_loading_ = true; | 2578 is_loading_ = true; |
| 2579 | 2579 |
| 2580 bool view_was_loading = render_view_->is_loading(); | 2580 bool view_was_loading = render_view_->is_loading(); |
| 2581 render_view_->FrameDidStartLoading(frame_); | 2581 render_view_->FrameDidStartLoading(frame_); |
| 2582 | 2582 |
| 2583 if (!view_was_loading) | 2583 if (!view_was_loading) |
| 2584 Send(new FrameHostMsg_DidStartLoading(routing_id_)); | 2584 Send(new FrameHostMsg_DidStartLoading(routing_id_, to_different_document)); |
| 2585 } | 2585 } |
| 2586 | 2586 |
| 2587 void RenderFrameImpl::didStopLoading() { | 2587 void RenderFrameImpl::didStopLoading() { |
| 2588 if (!is_loading_) { | 2588 if (!is_loading_) { |
| 2589 DVLOG(1) << "DidStopLoading called while not loading"; | 2589 DVLOG(1) << "DidStopLoading called while not loading"; |
| 2590 return; | 2590 return; |
| 2591 } | 2591 } |
| 2592 | 2592 |
| 2593 DCHECK(render_view_->is_loading()); | 2593 DCHECK(render_view_->is_loading()); |
| 2594 is_loading_ = false; | 2594 is_loading_ = false; |
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2919 selection_text_offset_ = offset; | 2919 selection_text_offset_ = offset; |
| 2920 selection_range_ = range; | 2920 selection_range_ = range; |
| 2921 // This IPC is dispatched by RenderWidetHost, so use its routing ID. | 2921 // This IPC is dispatched by RenderWidetHost, so use its routing ID. |
| 2922 Send(new ViewHostMsg_SelectionChanged( | 2922 Send(new ViewHostMsg_SelectionChanged( |
| 2923 GetRenderWidget()->routing_id(), text, offset, range)); | 2923 GetRenderWidget()->routing_id(), text, offset, range)); |
| 2924 } | 2924 } |
| 2925 GetRenderWidget()->UpdateSelectionBounds(); | 2925 GetRenderWidget()->UpdateSelectionBounds(); |
| 2926 } | 2926 } |
| 2927 | 2927 |
| 2928 } // namespace content | 2928 } // namespace content |
| OLD | NEW |