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

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

Issue 527713002: [ServiceWorker] Introduce skip_service_worker flag and remove LOAD_BYPASS_CACHE check. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Introduce skip_service_worker flag Created 6 years, 3 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/common/resource_messages.h ('k') | no next file » | 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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2721 matching lines...) Expand 10 before | Expand all | Expand 10 after
2732 extra_data->set_parent_is_main_frame(frame->parent() == top_frame); 2732 extra_data->set_parent_is_main_frame(frame->parent() == top_frame);
2733 extra_data->set_parent_render_frame_id(parent_routing_id); 2733 extra_data->set_parent_render_frame_id(parent_routing_id);
2734 extra_data->set_allow_download(navigation_state->allow_download()); 2734 extra_data->set_allow_download(navigation_state->allow_download());
2735 extra_data->set_transition_type(transition_type); 2735 extra_data->set_transition_type(transition_type);
2736 extra_data->set_should_replace_current_entry(should_replace_current_entry); 2736 extra_data->set_should_replace_current_entry(should_replace_current_entry);
2737 extra_data->set_transferred_request_child_id( 2737 extra_data->set_transferred_request_child_id(
2738 navigation_state->transferred_request_child_id()); 2738 navigation_state->transferred_request_child_id());
2739 extra_data->set_transferred_request_request_id( 2739 extra_data->set_transferred_request_request_id(
2740 navigation_state->transferred_request_request_id()); 2740 navigation_state->transferred_request_request_id());
2741 extra_data->set_service_worker_provider_id(provider_id); 2741 extra_data->set_service_worker_provider_id(provider_id);
2742 extra_data->set_skip_service_worker(request.skipServiceWorker());
2742 request.setExtraData(extra_data); 2743 request.setExtraData(extra_data);
2743 2744
2744 DocumentState* top_document_state = 2745 DocumentState* top_document_state =
2745 DocumentState::FromDataSource(top_data_source); 2746 DocumentState::FromDataSource(top_data_source);
2746 if (top_document_state) { 2747 if (top_document_state) {
2747 // TODO(gavinp): separate out prefetching and prerender field trials 2748 // TODO(gavinp): separate out prefetching and prerender field trials
2748 // if the rel=prerender rel type is sticking around. 2749 // if the rel=prerender rel type is sticking around.
2749 if (request.requestContext() == WebURLRequest::RequestContextPrefetch) 2750 if (request.requestContext() == WebURLRequest::RequestContextPrefetch)
2750 top_document_state->set_was_prefetcher(true); 2751 top_document_state->set_was_prefetcher(true);
2751 } 2752 }
(...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after
3854 3855
3855 #if defined(ENABLE_BROWSER_CDMS) 3856 #if defined(ENABLE_BROWSER_CDMS)
3856 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3857 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3857 if (!cdm_manager_) 3858 if (!cdm_manager_)
3858 cdm_manager_ = new RendererCdmManager(this); 3859 cdm_manager_ = new RendererCdmManager(this);
3859 return cdm_manager_; 3860 return cdm_manager_;
3860 } 3861 }
3861 #endif // defined(ENABLE_BROWSER_CDMS) 3862 #endif // defined(ENABLE_BROWSER_CDMS)
3862 3863
3863 } // namespace content 3864 } // namespace content
OLDNEW
« no previous file with comments | « content/common/resource_messages.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698