| 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 3684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3695 } | 3695 } |
| 3696 | 3696 |
| 3697 if (proxy_routing_id_ != MSG_ROUTING_NONE) { | 3697 if (proxy_routing_id_ != MSG_ROUTING_NONE) { |
| 3698 // If this is a provisional frame associated with a proxy (i.e., a frame | 3698 // If this is a provisional frame associated with a proxy (i.e., a frame |
| 3699 // created for a remote-to-local navigation), swap it into the frame tree | 3699 // created for a remote-to-local navigation), swap it into the frame tree |
| 3700 // now. | 3700 // now. |
| 3701 if (!SwapIn()) | 3701 if (!SwapIn()) |
| 3702 return; | 3702 return; |
| 3703 } | 3703 } |
| 3704 | 3704 |
| 3705 // For navigations that change the document, the browser process needs to be | 3705 // Navigations that change the document represent a new content source. Keep |
| 3706 // notified of the first paint of that page, so it can cancel the timer that | 3706 // track of that on the widget to help the browser process detect when stale |
| 3707 // waits for it. | 3707 // compositor frames are being shown after a commit. |
| 3708 if (is_main_frame_ && !navigation_state->WasWithinSameDocument()) { | 3708 if (is_main_frame_ && !navigation_state->WasWithinSameDocument()) |
| 3709 GetRenderWidget()->IncrementContentSourceId(); | 3709 GetRenderWidget()->IncrementContentSourceId(); |
| 3710 render_view_->QueueMessage( | |
| 3711 new ViewHostMsg_DidFirstPaintAfterLoad(render_view_->routing_id_), | |
| 3712 MESSAGE_DELIVERY_POLICY_WITH_VISUAL_STATE); | |
| 3713 } | |
| 3714 | 3710 |
| 3715 // When we perform a new navigation, we need to update the last committed | 3711 // When we perform a new navigation, we need to update the last committed |
| 3716 // session history entry with state for the page we are leaving. Do this | 3712 // session history entry with state for the page we are leaving. Do this |
| 3717 // before updating the current history item. | 3713 // before updating the current history item. |
| 3718 SendUpdateState(); | 3714 SendUpdateState(); |
| 3719 | 3715 |
| 3720 // Update the current history item for this frame. | 3716 // Update the current history item for this frame. |
| 3721 current_history_item_ = item; | 3717 current_history_item_ = item; |
| 3722 // Note: don't reference |item| after this point, as its value may not match | 3718 // Note: don't reference |item| after this point, as its value may not match |
| 3723 // |current_history_item_|. | 3719 // |current_history_item_|. |
| (...skipping 3255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6979 policy(info.defaultPolicy), | 6975 policy(info.defaultPolicy), |
| 6980 replaces_current_history_item(info.replacesCurrentHistoryItem), | 6976 replaces_current_history_item(info.replacesCurrentHistoryItem), |
| 6981 history_navigation_in_new_child_frame( | 6977 history_navigation_in_new_child_frame( |
| 6982 info.isHistoryNavigationInNewChildFrame), | 6978 info.isHistoryNavigationInNewChildFrame), |
| 6983 client_redirect(info.isClientRedirect), | 6979 client_redirect(info.isClientRedirect), |
| 6984 cache_disabled(info.isCacheDisabled), | 6980 cache_disabled(info.isCacheDisabled), |
| 6985 form(info.form), | 6981 form(info.form), |
| 6986 source_location(info.sourceLocation) {} | 6982 source_location(info.sourceLocation) {} |
| 6987 | 6983 |
| 6988 } // namespace content | 6984 } // namespace content |
| OLD | NEW |