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

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

Issue 547213002: [ServiceWorker] Move skip_service_worker flag from RequestExtraData to RequestInfo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/child/web_url_loader_impl.cc ('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 2748 matching lines...) Expand 10 before | Expand all | Expand 10 after
2759 extra_data->set_parent_is_main_frame(frame->parent() == top_frame); 2759 extra_data->set_parent_is_main_frame(frame->parent() == top_frame);
2760 extra_data->set_parent_render_frame_id(parent_routing_id); 2760 extra_data->set_parent_render_frame_id(parent_routing_id);
2761 extra_data->set_allow_download(navigation_state->allow_download()); 2761 extra_data->set_allow_download(navigation_state->allow_download());
2762 extra_data->set_transition_type(transition_type); 2762 extra_data->set_transition_type(transition_type);
2763 extra_data->set_should_replace_current_entry(should_replace_current_entry); 2763 extra_data->set_should_replace_current_entry(should_replace_current_entry);
2764 extra_data->set_transferred_request_child_id( 2764 extra_data->set_transferred_request_child_id(
2765 navigation_state->transferred_request_child_id()); 2765 navigation_state->transferred_request_child_id());
2766 extra_data->set_transferred_request_request_id( 2766 extra_data->set_transferred_request_request_id(
2767 navigation_state->transferred_request_request_id()); 2767 navigation_state->transferred_request_request_id());
2768 extra_data->set_service_worker_provider_id(provider_id); 2768 extra_data->set_service_worker_provider_id(provider_id);
2769 extra_data->set_skip_service_worker(request.skipServiceWorker());
2770 request.setExtraData(extra_data); 2769 request.setExtraData(extra_data);
2771 2770
2772 DocumentState* top_document_state = 2771 DocumentState* top_document_state =
2773 DocumentState::FromDataSource(top_data_source); 2772 DocumentState::FromDataSource(top_data_source);
2774 if (top_document_state) { 2773 if (top_document_state) {
2775 // TODO(gavinp): separate out prefetching and prerender field trials 2774 // TODO(gavinp): separate out prefetching and prerender field trials
2776 // if the rel=prerender rel type is sticking around. 2775 // if the rel=prerender rel type is sticking around.
2777 if (request.requestContext() == WebURLRequest::RequestContextPrefetch) 2776 if (request.requestContext() == WebURLRequest::RequestContextPrefetch)
2778 top_document_state->set_was_prefetcher(true); 2777 top_document_state->set_was_prefetcher(true);
2779 } 2778 }
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
3881 3880
3882 #if defined(ENABLE_BROWSER_CDMS) 3881 #if defined(ENABLE_BROWSER_CDMS)
3883 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3882 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3884 if (!cdm_manager_) 3883 if (!cdm_manager_)
3885 cdm_manager_ = new RendererCdmManager(this); 3884 cdm_manager_ = new RendererCdmManager(this);
3886 return cdm_manager_; 3885 return cdm_manager_;
3887 } 3886 }
3888 #endif // defined(ENABLE_BROWSER_CDMS) 3887 #endif // defined(ENABLE_BROWSER_CDMS)
3889 3888
3890 } // namespace content 3889 } // namespace content
OLDNEW
« no previous file with comments | « content/child/web_url_loader_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698