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

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

Issue 2701753003: [WIP] off-main-thread loading
Patch Set: small fix Created 3 years, 8 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/renderer/renderer_blink_platform_impl.h » ('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 <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 6793 matching lines...) Expand 10 before | Expand all | Expand 10 after
6804 if (GetContentClient()->renderer()->ShouldOverridePageVisibilityState( 6804 if (GetContentClient()->renderer()->ShouldOverridePageVisibilityState(
6805 this, &override_state)) 6805 this, &override_state))
6806 return override_state; 6806 return override_state;
6807 return current_state; 6807 return current_state;
6808 } 6808 }
6809 6809
6810 blink::WebPageVisibilityState RenderFrameImpl::GetVisibilityState() const { 6810 blink::WebPageVisibilityState RenderFrameImpl::GetVisibilityState() const {
6811 return visibilityState(); 6811 return visibilityState();
6812 } 6812 }
6813 6813
6814 void RenderFrameImpl::propagateAuxiliaryFetchContext(
6815 blink::WebWorkerFetchContextInfo* webWorkerFetchContextInfo) const {
6816 webWorkerFetchContextInfo->setParentFrameID(routing_id_);
6817 webWorkerFetchContextInfo->setIsSecureContext(
6818 frame_->document().isSecureContext());
6819
6820 blink::WebServiceWorkerNetworkProvider* webProvider =
6821 frame_->dataSource()->getServiceWorkerNetworkProvider();
6822 if (webProvider) {
6823 ServiceWorkerNetworkProvider* provider =
6824 ServiceWorkerNetworkProvider::FromWebServiceWorkerNetworkProvider(
6825 webProvider);
6826 webWorkerFetchContextInfo->setServiceWorkerProviderID(
6827 provider->provider_id());
6828 webWorkerFetchContextInfo->setIsControlledByServiceWorker(
6829 provider->IsControlledByServiceWorker());
6830 }
6831 }
6832
6814 bool RenderFrameImpl::IsBrowserSideNavigationPending() { 6833 bool RenderFrameImpl::IsBrowserSideNavigationPending() {
6815 return browser_side_navigation_pending_; 6834 return browser_side_navigation_pending_;
6816 } 6835 }
6817 6836
6818 base::SingleThreadTaskRunner* RenderFrameImpl::GetTimerTaskRunner() { 6837 base::SingleThreadTaskRunner* RenderFrameImpl::GetTimerTaskRunner() {
6819 return GetWebFrame()->timerTaskRunner(); 6838 return GetWebFrame()->timerTaskRunner();
6820 } 6839 }
6821 6840
6822 base::SingleThreadTaskRunner* RenderFrameImpl::GetLoadingTaskRunner() { 6841 base::SingleThreadTaskRunner* RenderFrameImpl::GetLoadingTaskRunner() {
6823 return GetWebFrame()->loadingTaskRunner(); 6842 return GetWebFrame()->loadingTaskRunner();
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
6971 policy(info.defaultPolicy), 6990 policy(info.defaultPolicy),
6972 replaces_current_history_item(info.replacesCurrentHistoryItem), 6991 replaces_current_history_item(info.replacesCurrentHistoryItem),
6973 history_navigation_in_new_child_frame( 6992 history_navigation_in_new_child_frame(
6974 info.isHistoryNavigationInNewChildFrame), 6993 info.isHistoryNavigationInNewChildFrame),
6975 client_redirect(info.isClientRedirect), 6994 client_redirect(info.isClientRedirect),
6976 cache_disabled(info.isCacheDisabled), 6995 cache_disabled(info.isCacheDisabled),
6977 form(info.form), 6996 form(info.form),
6978 source_location(info.sourceLocation) {} 6997 source_location(info.sourceLocation) {}
6979 6998
6980 } // namespace content 6999 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/renderer_blink_platform_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698