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

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

Issue 2071433003: Reland: service worker: Don't control a subframe of an insecure context (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revised Created 4 years, 6 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 <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 3122 matching lines...) Expand 10 before | Expand all | Expand 10 after
3133 // Create the serviceworker's per-document network observing object if it 3133 // Create the serviceworker's per-document network observing object if it
3134 // does not exist (When navigation happens within a page, the provider already 3134 // does not exist (When navigation happens within a page, the provider already
3135 // exists). 3135 // exists).
3136 if (ServiceWorkerNetworkProvider::FromDocumentState( 3136 if (ServiceWorkerNetworkProvider::FromDocumentState(
3137 DocumentState::FromDataSource(datasource))) 3137 DocumentState::FromDataSource(datasource)))
3138 return; 3138 return;
3139 3139
3140 ServiceWorkerNetworkProvider::AttachToDocumentState( 3140 ServiceWorkerNetworkProvider::AttachToDocumentState(
3141 DocumentState::FromDataSource(datasource), 3141 DocumentState::FromDataSource(datasource),
3142 ServiceWorkerNetworkProvider::CreateForNavigation( 3142 ServiceWorkerNetworkProvider::CreateForNavigation(
3143 routing_id_, navigation_state->request_params(), 3143 routing_id_, navigation_state->request_params(), frame,
3144 frame->effectiveSandboxFlags(), content_initiated)); 3144 content_initiated));
3145 } 3145 }
3146 3146
3147 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame, 3147 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame,
3148 double triggering_event_time) { 3148 double triggering_event_time) {
3149 DCHECK_EQ(frame_, frame); 3149 DCHECK_EQ(frame_, frame);
3150 WebDataSource* ds = frame->provisionalDataSource(); 3150 WebDataSource* ds = frame->provisionalDataSource();
3151 3151
3152 // In fast/loader/stop-provisional-loads.html, we abort the load before this 3152 // In fast/loader/stop-provisional-loads.html, we abort the load before this
3153 // callback is invoked. 3153 // callback is invoked.
3154 if (!ds) 3154 if (!ds)
(...skipping 3083 matching lines...) Expand 10 before | Expand all | Expand 10 after
6238 // event target. Potentially a Pepper plugin will receive the event. 6238 // event target. Potentially a Pepper plugin will receive the event.
6239 // In order to tell whether a plugin gets the last mouse event and which it 6239 // In order to tell whether a plugin gets the last mouse event and which it
6240 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6240 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6241 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6241 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6242 // |pepper_last_mouse_event_target_|. 6242 // |pepper_last_mouse_event_target_|.
6243 pepper_last_mouse_event_target_ = nullptr; 6243 pepper_last_mouse_event_target_ = nullptr;
6244 #endif 6244 #endif
6245 } 6245 }
6246 6246
6247 } // namespace content 6247 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | content/renderer/service_worker/service_worker_context_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698