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 2751 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2762 while (!pending_code_execution_queue_.empty()) { | 2762 while (!pending_code_execution_queue_.empty()) { |
2763 linked_ptr<ViewMsg_ExecuteCode_Params>& params = | 2763 linked_ptr<ViewMsg_ExecuteCode_Params>& params = |
2764 pending_code_execution_queue_.front(); | 2764 pending_code_execution_queue_.front(); |
2765 ExecuteCodeImpl(main_frame, *params); | 2765 ExecuteCodeImpl(main_frame, *params); |
2766 pending_code_execution_queue_.pop(); | 2766 pending_code_execution_queue_.pop(); |
2767 } | 2767 } |
2768 } | 2768 } |
2769 } | 2769 } |
2770 | 2770 |
2771 void RenderView::didHandleOnloadEvents(WebFrame* frame) { | 2771 void RenderView::didHandleOnloadEvents(WebFrame* frame) { |
2772 // Ignore | 2772 if (webview()->mainFrame() == frame) |
| 2773 Send(new ViewHostMsg_DocumentOnLoadCompletedInMainFrame(routing_id_)); |
2773 } | 2774 } |
2774 | 2775 |
2775 void RenderView::didFailLoad(WebFrame* frame, const WebURLError& error) { | 2776 void RenderView::didFailLoad(WebFrame* frame, const WebURLError& error) { |
2776 // Ignore | 2777 // Ignore |
2777 } | 2778 } |
2778 | 2779 |
2779 void RenderView::didFinishLoad(WebFrame* frame) { | 2780 void RenderView::didFinishLoad(WebFrame* frame) { |
2780 WebDataSource* ds = frame->dataSource(); | 2781 WebDataSource* ds = frame->dataSource(); |
2781 NavigationState* navigation_state = NavigationState::FromDataSource(ds); | 2782 NavigationState* navigation_state = NavigationState::FromDataSource(ds); |
2782 DCHECK(navigation_state); | 2783 DCHECK(navigation_state); |
(...skipping 2160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4943 | 4944 |
4944 if (last_top_level_navigation_page_id_ != page_id_ && | 4945 if (last_top_level_navigation_page_id_ != page_id_ && |
4945 // Not interested in reloads. | 4946 // Not interested in reloads. |
4946 type != WebKit::WebNavigationTypeReload && | 4947 type != WebKit::WebNavigationTypeReload && |
4947 type != WebKit::WebNavigationTypeFormSubmitted) { | 4948 type != WebKit::WebNavigationTypeFormSubmitted) { |
4948 return true; | 4949 return true; |
4949 } | 4950 } |
4950 } | 4951 } |
4951 return false; | 4952 return false; |
4952 } | 4953 } |
OLD | NEW |