| 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 #include "content/renderer/media/web_media_element_source_utils.h" | 126 #include "content/renderer/media/web_media_element_source_utils.h" |
| 127 #include "content/renderer/media/webmediaplayer_ms.h" | 127 #include "content/renderer/media/webmediaplayer_ms.h" |
| 128 #include "content/renderer/mojo/blink_connector_js_wrapper.h" | 128 #include "content/renderer/mojo/blink_connector_js_wrapper.h" |
| 129 #include "content/renderer/mojo/blink_interface_registry_impl.h" | 129 #include "content/renderer/mojo/blink_interface_registry_impl.h" |
| 130 #include "content/renderer/mojo/interface_provider_js_wrapper.h" | 130 #include "content/renderer/mojo/interface_provider_js_wrapper.h" |
| 131 #include "content/renderer/mojo_bindings_controller.h" | 131 #include "content/renderer/mojo_bindings_controller.h" |
| 132 #include "content/renderer/navigation_state_impl.h" | 132 #include "content/renderer/navigation_state_impl.h" |
| 133 #include "content/renderer/pepper/pepper_audio_controller.h" | 133 #include "content/renderer/pepper/pepper_audio_controller.h" |
| 134 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" | 134 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" |
| 135 #include "content/renderer/presentation/presentation_dispatcher.h" | 135 #include "content/renderer/presentation/presentation_dispatcher.h" |
| 136 #include "content/renderer/previews_state_helper.h" |
| 136 #include "content/renderer/push_messaging/push_messaging_client.h" | 137 #include "content/renderer/push_messaging/push_messaging_client.h" |
| 137 #include "content/renderer/render_frame_proxy.h" | 138 #include "content/renderer/render_frame_proxy.h" |
| 138 #include "content/renderer/render_process.h" | 139 #include "content/renderer/render_process.h" |
| 139 #include "content/renderer/render_thread_impl.h" | 140 #include "content/renderer/render_thread_impl.h" |
| 140 #include "content/renderer/render_view_impl.h" | 141 #include "content/renderer/render_view_impl.h" |
| 141 #include "content/renderer/render_widget_fullscreen_pepper.h" | 142 #include "content/renderer/render_widget_fullscreen_pepper.h" |
| 142 #include "content/renderer/renderer_blink_platform_impl.h" | 143 #include "content/renderer/renderer_blink_platform_impl.h" |
| 143 #include "content/renderer/renderer_webapplicationcachehost_impl.h" | 144 #include "content/renderer/renderer_webapplicationcachehost_impl.h" |
| 144 #include "content/renderer/renderer_webcolorchooser_impl.h" | 145 #include "content/renderer/renderer_webcolorchooser_impl.h" |
| 145 #include "content/renderer/savable_resources.h" | 146 #include "content/renderer/savable_resources.h" |
| (...skipping 3692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3838 DocumentState::FromDataSource(frame_->DataSource()); | 3839 DocumentState::FromDataSource(frame_->DataSource()); |
| 3839 NavigationStateImpl* navigation_state = | 3840 NavigationStateImpl* navigation_state = |
| 3840 static_cast<NavigationStateImpl*>(document_state->navigation_state()); | 3841 static_cast<NavigationStateImpl*>(document_state->navigation_state()); |
| 3841 const WebURLResponse& web_url_response = frame_->DataSource()->GetResponse(); | 3842 const WebURLResponse& web_url_response = frame_->DataSource()->GetResponse(); |
| 3842 WebURLResponseExtraDataImpl* extra_data = | 3843 WebURLResponseExtraDataImpl* extra_data = |
| 3843 GetExtraDataFromResponse(web_url_response); | 3844 GetExtraDataFromResponse(web_url_response); |
| 3844 // Only update the PreviewsState and effective connection type states for new | 3845 // Only update the PreviewsState and effective connection type states for new |
| 3845 // main frame documents. Subframes inherit from the main frame and should not | 3846 // main frame documents. Subframes inherit from the main frame and should not |
| 3846 // change at commit time. | 3847 // change at commit time. |
| 3847 if (is_main_frame_ && !navigation_state->WasWithinSameDocument()) { | 3848 if (is_main_frame_ && !navigation_state->WasWithinSameDocument()) { |
| 3848 previews_state_ = | 3849 previews_state_ = PREVIEWS_OFF; |
| 3849 extra_data ? extra_data->previews_state() : PREVIEWS_OFF; | |
| 3850 | |
| 3851 if (extra_data) { | 3850 if (extra_data) { |
| 3851 previews_state_ = UpdatePreviewsStateFromMainFrameResponse( |
| 3852 extra_data->previews_state(), web_url_response); |
| 3852 effective_connection_type_ = | 3853 effective_connection_type_ = |
| 3853 EffectiveConnectionTypeToWebEffectiveConnectionType( | 3854 EffectiveConnectionTypeToWebEffectiveConnectionType( |
| 3854 extra_data->effective_connection_type()); | 3855 extra_data->effective_connection_type()); |
| 3855 } | 3856 } |
| 3856 } | 3857 } |
| 3857 | 3858 |
| 3858 if (proxy_routing_id_ != MSG_ROUTING_NONE) { | 3859 if (proxy_routing_id_ != MSG_ROUTING_NONE) { |
| 3859 // If this is a provisional frame associated with a proxy (i.e., a frame | 3860 // If this is a provisional frame associated with a proxy (i.e., a frame |
| 3860 // created for a remote-to-local navigation), swap it into the frame tree | 3861 // created for a remote-to-local navigation), swap it into the frame tree |
| 3861 // now. | 3862 // now. |
| (...skipping 3317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7179 policy(info.default_policy), | 7180 policy(info.default_policy), |
| 7180 replaces_current_history_item(info.replaces_current_history_item), | 7181 replaces_current_history_item(info.replaces_current_history_item), |
| 7181 history_navigation_in_new_child_frame( | 7182 history_navigation_in_new_child_frame( |
| 7182 info.is_history_navigation_in_new_child_frame), | 7183 info.is_history_navigation_in_new_child_frame), |
| 7183 client_redirect(info.is_client_redirect), | 7184 client_redirect(info.is_client_redirect), |
| 7184 cache_disabled(info.is_cache_disabled), | 7185 cache_disabled(info.is_cache_disabled), |
| 7185 form(info.form), | 7186 form(info.form), |
| 7186 source_location(info.source_location) {} | 7187 source_location(info.source_location) {} |
| 7187 | 7188 |
| 7188 } // namespace content | 7189 } // namespace content |
| OLD | NEW |