| 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 2712 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2723 while (!pending_code_execution_queue_.empty()) { | 2723 while (!pending_code_execution_queue_.empty()) { |
| 2724 linked_ptr<ViewMsg_ExecuteCode_Params>& params = | 2724 linked_ptr<ViewMsg_ExecuteCode_Params>& params = |
| 2725 pending_code_execution_queue_.front(); | 2725 pending_code_execution_queue_.front(); |
| 2726 ExecuteCodeImpl(main_frame, *params); | 2726 ExecuteCodeImpl(main_frame, *params); |
| 2727 pending_code_execution_queue_.pop(); | 2727 pending_code_execution_queue_.pop(); |
| 2728 } | 2728 } |
| 2729 } | 2729 } |
| 2730 } | 2730 } |
| 2731 | 2731 |
| 2732 void RenderView::didHandleOnloadEvents(WebFrame* frame) { | 2732 void RenderView::didHandleOnloadEvents(WebFrame* frame) { |
| 2733 // Ignore | 2733 if (webview()->mainFrame() == frame) |
| 2734 Send(new ViewHostMsg_DocumentOnLoadCompletedInMainFrame(routing_id_)); |
| 2734 } | 2735 } |
| 2735 | 2736 |
| 2736 void RenderView::didFailLoad(WebFrame* frame, const WebURLError& error) { | 2737 void RenderView::didFailLoad(WebFrame* frame, const WebURLError& error) { |
| 2737 // Ignore | 2738 // Ignore |
| 2738 } | 2739 } |
| 2739 | 2740 |
| 2740 void RenderView::didFinishLoad(WebFrame* frame) { | 2741 void RenderView::didFinishLoad(WebFrame* frame) { |
| 2741 WebDataSource* ds = frame->dataSource(); | 2742 WebDataSource* ds = frame->dataSource(); |
| 2742 NavigationState* navigation_state = NavigationState::FromDataSource(ds); | 2743 NavigationState* navigation_state = NavigationState::FromDataSource(ds); |
| 2743 DCHECK(navigation_state); | 2744 DCHECK(navigation_state); |
| (...skipping 2261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5005 | 5006 |
| 5006 if (last_top_level_navigation_page_id_ != page_id_ && | 5007 if (last_top_level_navigation_page_id_ != page_id_ && |
| 5007 // Not interested in reloads. | 5008 // Not interested in reloads. |
| 5008 type != WebKit::WebNavigationTypeReload && | 5009 type != WebKit::WebNavigationTypeReload && |
| 5009 type != WebKit::WebNavigationTypeFormSubmitted) { | 5010 type != WebKit::WebNavigationTypeFormSubmitted) { |
| 5010 return true; | 5011 return true; |
| 5011 } | 5012 } |
| 5012 } | 5013 } |
| 5013 return false; | 5014 return false; |
| 5014 } | 5015 } |
| OLD | NEW |