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

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

Issue 2963913002: Factor DRP PreviewsState logic out of content (Closed)
Patch Set: dougarnett comments Created 3 years, 5 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
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 <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 #include "content/renderer/media/media_stream_dispatcher.h" 127 #include "content/renderer/media/media_stream_dispatcher.h"
128 #include "content/renderer/media/user_media_client_impl.h" 128 #include "content/renderer/media/user_media_client_impl.h"
129 #include "content/renderer/mojo/blink_connector_js_wrapper.h" 129 #include "content/renderer/mojo/blink_connector_js_wrapper.h"
130 #include "content/renderer/mojo/blink_interface_registry_impl.h" 130 #include "content/renderer/mojo/blink_interface_registry_impl.h"
131 #include "content/renderer/mojo/interface_provider_js_wrapper.h" 131 #include "content/renderer/mojo/interface_provider_js_wrapper.h"
132 #include "content/renderer/mojo_bindings_controller.h" 132 #include "content/renderer/mojo_bindings_controller.h"
133 #include "content/renderer/navigation_state_impl.h" 133 #include "content/renderer/navigation_state_impl.h"
134 #include "content/renderer/pepper/pepper_audio_controller.h" 134 #include "content/renderer/pepper/pepper_audio_controller.h"
135 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" 135 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
136 #include "content/renderer/presentation/presentation_dispatcher.h" 136 #include "content/renderer/presentation/presentation_dispatcher.h"
137 #include "content/renderer/previews_state_helper.h"
138 #include "content/renderer/push_messaging/push_messaging_client.h" 137 #include "content/renderer/push_messaging/push_messaging_client.h"
139 #include "content/renderer/render_frame_proxy.h" 138 #include "content/renderer/render_frame_proxy.h"
140 #include "content/renderer/render_process.h" 139 #include "content/renderer/render_process.h"
141 #include "content/renderer/render_thread_impl.h" 140 #include "content/renderer/render_thread_impl.h"
142 #include "content/renderer/render_view_impl.h" 141 #include "content/renderer/render_view_impl.h"
143 #include "content/renderer/render_widget_fullscreen_pepper.h" 142 #include "content/renderer/render_widget_fullscreen_pepper.h"
144 #include "content/renderer/renderer_blink_platform_impl.h" 143 #include "content/renderer/renderer_blink_platform_impl.h"
145 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 144 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
146 #include "content/renderer/renderer_webcolorchooser_impl.h" 145 #include "content/renderer/renderer_webcolorchooser_impl.h"
147 #include "content/renderer/savable_resources.h" 146 #include "content/renderer/savable_resources.h"
(...skipping 2613 matching lines...) Expand 10 before | Expand all | Expand 10 after
2761 2760
2762 blink::WebConsoleMessage wcm(target_level, WebString::FromUTF8(message)); 2761 blink::WebConsoleMessage wcm(target_level, WebString::FromUTF8(message));
2763 frame_->AddMessageToConsole(wcm); 2762 frame_->AddMessageToConsole(wcm);
2764 } 2763 }
2765 2764
2766 void RenderFrameImpl::DetachDevToolsForTest() { 2765 void RenderFrameImpl::DetachDevToolsForTest() {
2767 if (devtools_agent_) 2766 if (devtools_agent_)
2768 devtools_agent_->DetachAllSessions(); 2767 devtools_agent_->DetachAllSessions();
2769 } 2768 }
2770 2769
2770 void RenderFrameImpl::SetPreviewsState(PreviewsState previews_state) {
2771 previews_state_ = previews_state;
2772 }
2773
2771 PreviewsState RenderFrameImpl::GetPreviewsState() const { 2774 PreviewsState RenderFrameImpl::GetPreviewsState() const {
2772 return previews_state_; 2775 return previews_state_;
2773 } 2776 }
2774 2777
2775 bool RenderFrameImpl::IsPasting() const { 2778 bool RenderFrameImpl::IsPasting() const {
2776 return is_pasting_; 2779 return is_pasting_;
2777 } 2780 }
2778 2781
2779 // blink::mojom::EngagementClient implementation ------------------------------- 2782 // blink::mojom::EngagementClient implementation -------------------------------
2780 2783
(...skipping 832 matching lines...) Expand 10 before | Expand all | Expand 10 after
3613 static_cast<NavigationStateImpl*>(document_state->navigation_state()); 3616 static_cast<NavigationStateImpl*>(document_state->navigation_state());
3614 const WebURLResponse& web_url_response = frame_->DataSource()->GetResponse(); 3617 const WebURLResponse& web_url_response = frame_->DataSource()->GetResponse();
3615 WebURLResponseExtraDataImpl* extra_data = 3618 WebURLResponseExtraDataImpl* extra_data =
3616 GetExtraDataFromResponse(web_url_response); 3619 GetExtraDataFromResponse(web_url_response);
3617 // Only update the PreviewsState and effective connection type states for new 3620 // Only update the PreviewsState and effective connection type states for new
3618 // main frame documents. Subframes inherit from the main frame and should not 3621 // main frame documents. Subframes inherit from the main frame and should not
3619 // change at commit time. 3622 // change at commit time.
3620 if (is_main_frame_ && !navigation_state->WasWithinSameDocument()) { 3623 if (is_main_frame_ && !navigation_state->WasWithinSameDocument()) {
3621 previews_state_ = PREVIEWS_OFF; 3624 previews_state_ = PREVIEWS_OFF;
3622 if (extra_data) { 3625 if (extra_data) {
3623 previews_state_ = GetPreviewsStateFromMainFrameResponse( 3626 previews_state_ = extra_data->previews_state();
3624 extra_data->previews_state(), web_url_response);
3625 effective_connection_type_ = 3627 effective_connection_type_ =
3626 EffectiveConnectionTypeToWebEffectiveConnectionType( 3628 EffectiveConnectionTypeToWebEffectiveConnectionType(
3627 extra_data->effective_connection_type()); 3629 extra_data->effective_connection_type());
3628 } 3630 }
3629 } 3631 }
3630 3632
3631 if (proxy_routing_id_ != MSG_ROUTING_NONE) { 3633 if (proxy_routing_id_ != MSG_ROUTING_NONE) {
3632 // If this is a provisional frame associated with a proxy (i.e., a frame 3634 // If this is a provisional frame associated with a proxy (i.e., a frame
3633 // created for a remote-to-local navigation), swap it into the frame tree 3635 // created for a remote-to-local navigation), swap it into the frame tree
3634 // now. 3636 // now.
(...skipping 3253 matching lines...) Expand 10 before | Expand all | Expand 10 after
6888 replaces_current_history_item(info.replaces_current_history_item), 6890 replaces_current_history_item(info.replaces_current_history_item),
6889 history_navigation_in_new_child_frame( 6891 history_navigation_in_new_child_frame(
6890 info.is_history_navigation_in_new_child_frame), 6892 info.is_history_navigation_in_new_child_frame),
6891 client_redirect(info.is_client_redirect), 6893 client_redirect(info.is_client_redirect),
6892 triggering_event_info(info.triggering_event_info), 6894 triggering_event_info(info.triggering_event_info),
6893 cache_disabled(info.is_cache_disabled), 6895 cache_disabled(info.is_cache_disabled),
6894 form(info.form), 6896 form(info.form),
6895 source_location(info.source_location) {} 6897 source_location(info.source_location) {}
6896 6898
6897 } // namespace content 6899 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698