Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2963913002: Factor DRP PreviewsState logic out of content (Closed)
Patch Set: Change WebDataSource to WebDocumentLoader Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <string.h> 7 #include <string.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 #include "content/renderer/media/media_stream_dispatcher.h" 128 #include "content/renderer/media/media_stream_dispatcher.h"
129 #include "content/renderer/media/user_media_client_impl.h" 129 #include "content/renderer/media/user_media_client_impl.h"
130 #include "content/renderer/mojo/blink_connector_js_wrapper.h" 130 #include "content/renderer/mojo/blink_connector_js_wrapper.h"
131 #include "content/renderer/mojo/blink_interface_registry_impl.h" 131 #include "content/renderer/mojo/blink_interface_registry_impl.h"
132 #include "content/renderer/mojo/interface_provider_js_wrapper.h" 132 #include "content/renderer/mojo/interface_provider_js_wrapper.h"
133 #include "content/renderer/mojo_bindings_controller.h" 133 #include "content/renderer/mojo_bindings_controller.h"
134 #include "content/renderer/navigation_state_impl.h" 134 #include "content/renderer/navigation_state_impl.h"
135 #include "content/renderer/pepper/pepper_audio_controller.h" 135 #include "content/renderer/pepper/pepper_audio_controller.h"
136 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" 136 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
137 #include "content/renderer/presentation/presentation_dispatcher.h" 137 #include "content/renderer/presentation/presentation_dispatcher.h"
138 #include "content/renderer/previews_state_helper.h"
139 #include "content/renderer/push_messaging/push_messaging_client.h" 138 #include "content/renderer/push_messaging/push_messaging_client.h"
140 #include "content/renderer/render_frame_proxy.h" 139 #include "content/renderer/render_frame_proxy.h"
141 #include "content/renderer/render_process.h" 140 #include "content/renderer/render_process.h"
142 #include "content/renderer/render_thread_impl.h" 141 #include "content/renderer/render_thread_impl.h"
143 #include "content/renderer/render_view_impl.h" 142 #include "content/renderer/render_view_impl.h"
144 #include "content/renderer/render_widget_fullscreen_pepper.h" 143 #include "content/renderer/render_widget_fullscreen_pepper.h"
145 #include "content/renderer/renderer_blink_platform_impl.h" 144 #include "content/renderer/renderer_blink_platform_impl.h"
146 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 145 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
147 #include "content/renderer/renderer_webcolorchooser_impl.h" 146 #include "content/renderer/renderer_webcolorchooser_impl.h"
148 #include "content/renderer/savable_resources.h" 147 #include "content/renderer/savable_resources.h"
(...skipping 2690 matching lines...) Expand 10 before | Expand all | Expand 10 after
2839 2838
2840 blink::WebConsoleMessage wcm(target_level, WebString::FromUTF8(message)); 2839 blink::WebConsoleMessage wcm(target_level, WebString::FromUTF8(message));
2841 frame_->AddMessageToConsole(wcm); 2840 frame_->AddMessageToConsole(wcm);
2842 } 2841 }
2843 2842
2844 void RenderFrameImpl::DetachDevToolsForTest() { 2843 void RenderFrameImpl::DetachDevToolsForTest() {
2845 if (devtools_agent_) 2844 if (devtools_agent_)
2846 devtools_agent_->DetachAllSessions(); 2845 devtools_agent_->DetachAllSessions();
2847 } 2846 }
2848 2847
2848 void RenderFrameImpl::SetPreviewsState(PreviewsState previews_state) {
2849 previews_state_ = previews_state;
2850 }
2851
2849 PreviewsState RenderFrameImpl::GetPreviewsState() const { 2852 PreviewsState RenderFrameImpl::GetPreviewsState() const {
2850 return previews_state_; 2853 return previews_state_;
2851 } 2854 }
2852 2855
2853 bool RenderFrameImpl::IsPasting() const { 2856 bool RenderFrameImpl::IsPasting() const {
2854 return is_pasting_; 2857 return is_pasting_;
2855 } 2858 }
2856 2859
2857 // blink::mojom::EngagementClient implementation ------------------------------- 2860 // blink::mojom::EngagementClient implementation -------------------------------
2858 2861
(...skipping 845 matching lines...) Expand 10 before | Expand all | Expand 10 after
3704 const WebURLResponse& web_url_response = 3707 const WebURLResponse& web_url_response =
3705 frame_->GetDocumentLoader()->GetResponse(); 3708 frame_->GetDocumentLoader()->GetResponse();
3706 WebURLResponseExtraDataImpl* extra_data = 3709 WebURLResponseExtraDataImpl* extra_data =
3707 GetExtraDataFromResponse(web_url_response); 3710 GetExtraDataFromResponse(web_url_response);
3708 // Only update the PreviewsState and effective connection type states for new 3711 // Only update the PreviewsState and effective connection type states for new
3709 // main frame documents. Subframes inherit from the main frame and should not 3712 // main frame documents. Subframes inherit from the main frame and should not
3710 // change at commit time. 3713 // change at commit time.
3711 if (is_main_frame_ && !navigation_state->WasWithinSameDocument()) { 3714 if (is_main_frame_ && !navigation_state->WasWithinSameDocument()) {
3712 previews_state_ = PREVIEWS_OFF; 3715 previews_state_ = PREVIEWS_OFF;
3713 if (extra_data) { 3716 if (extra_data) {
3714 previews_state_ = GetPreviewsStateFromMainFrameResponse( 3717 previews_state_ = extra_data->previews_state();
3715 extra_data->previews_state(), web_url_response);
3716 effective_connection_type_ = 3718 effective_connection_type_ =
3717 EffectiveConnectionTypeToWebEffectiveConnectionType( 3719 EffectiveConnectionTypeToWebEffectiveConnectionType(
3718 extra_data->effective_connection_type()); 3720 extra_data->effective_connection_type());
3719 } 3721 }
3720 } 3722 }
3721 3723
3722 if (proxy_routing_id_ != MSG_ROUTING_NONE) { 3724 if (proxy_routing_id_ != MSG_ROUTING_NONE) {
3723 // If this is a provisional frame associated with a proxy (i.e., a frame 3725 // If this is a provisional frame associated with a proxy (i.e., a frame
3724 // created for a remote-to-local navigation), swap it into the frame tree 3726 // created for a remote-to-local navigation), swap it into the frame tree
3725 // now. 3727 // now.
(...skipping 3374 matching lines...) Expand 10 before | Expand all | Expand 10 after
7100 replaces_current_history_item(info.replaces_current_history_item), 7102 replaces_current_history_item(info.replaces_current_history_item),
7101 history_navigation_in_new_child_frame( 7103 history_navigation_in_new_child_frame(
7102 info.is_history_navigation_in_new_child_frame), 7104 info.is_history_navigation_in_new_child_frame),
7103 client_redirect(info.is_client_redirect), 7105 client_redirect(info.is_client_redirect),
7104 triggering_event_info(info.triggering_event_info), 7106 triggering_event_info(info.triggering_event_info),
7105 cache_disabled(info.is_cache_disabled), 7107 cache_disabled(info.is_cache_disabled),
7106 form(info.form), 7108 form(info.form),
7107 source_location(info.source_location) {} 7109 source_location(info.source_location) {}
7108 7110
7109 } // namespace content 7111 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698