OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/renderer/render_view.h" | 5 #include "chrome/renderer/render_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 2752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2763 while (!pending_code_execution_queue_.empty()) { | 2763 while (!pending_code_execution_queue_.empty()) { |
2764 linked_ptr<ViewMsg_ExecuteCode_Params>& params = | 2764 linked_ptr<ViewMsg_ExecuteCode_Params>& params = |
2765 pending_code_execution_queue_.front(); | 2765 pending_code_execution_queue_.front(); |
2766 ExecuteCodeImpl(main_frame, *params); | 2766 ExecuteCodeImpl(main_frame, *params); |
2767 pending_code_execution_queue_.pop(); | 2767 pending_code_execution_queue_.pop(); |
2768 } | 2768 } |
2769 } | 2769 } |
2770 } | 2770 } |
2771 | 2771 |
2772 void RenderView::didHandleOnloadEvents(WebFrame* frame) { | 2772 void RenderView::didHandleOnloadEvents(WebFrame* frame) { |
2773 // Ignore | 2773 if (webview()->mainFrame() == frame) |
| 2774 Send(new ViewHostMsg_DocumentOnLoadCompletedInMainFrame(routing_id_)); |
2774 } | 2775 } |
2775 | 2776 |
2776 void RenderView::didFailLoad(WebFrame* frame, const WebURLError& error) { | 2777 void RenderView::didFailLoad(WebFrame* frame, const WebURLError& error) { |
2777 // Ignore | 2778 // Ignore |
2778 } | 2779 } |
2779 | 2780 |
2780 void RenderView::didFinishLoad(WebFrame* frame) { | 2781 void RenderView::didFinishLoad(WebFrame* frame) { |
2781 WebDataSource* ds = frame->dataSource(); | 2782 WebDataSource* ds = frame->dataSource(); |
2782 NavigationState* navigation_state = NavigationState::FromDataSource(ds); | 2783 NavigationState* navigation_state = NavigationState::FromDataSource(ds); |
2783 DCHECK(navigation_state); | 2784 DCHECK(navigation_state); |
(...skipping 2165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4949 | 4950 |
4950 if (last_top_level_navigation_page_id_ != page_id_ && | 4951 if (last_top_level_navigation_page_id_ != page_id_ && |
4951 // Not interested in reloads. | 4952 // Not interested in reloads. |
4952 type != WebKit::WebNavigationTypeReload && | 4953 type != WebKit::WebNavigationTypeReload && |
4953 type != WebKit::WebNavigationTypeFormSubmitted) { | 4954 type != WebKit::WebNavigationTypeFormSubmitted) { |
4954 return true; | 4955 return true; |
4955 } | 4956 } |
4956 } | 4957 } |
4957 return false; | 4958 return false; |
4958 } | 4959 } |
OLD | NEW |