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

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

Issue 2009453002: service worker: Don't control a subframe of an insecure context (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: refactor errorMessage 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 3051 matching lines...) Expand 10 before | Expand all | Expand 10 after
3062 // Create the serviceworker's per-document network observing object if it 3062 // Create the serviceworker's per-document network observing object if it
3063 // does not exist (When navigation happens within a page, the provider already 3063 // does not exist (When navigation happens within a page, the provider already
3064 // exists). 3064 // exists).
3065 if (ServiceWorkerNetworkProvider::FromDocumentState( 3065 if (ServiceWorkerNetworkProvider::FromDocumentState(
3066 DocumentState::FromDataSource(datasource))) 3066 DocumentState::FromDataSource(datasource)))
3067 return; 3067 return;
3068 3068
3069 ServiceWorkerNetworkProvider::AttachToDocumentState( 3069 ServiceWorkerNetworkProvider::AttachToDocumentState(
3070 DocumentState::FromDataSource(datasource), 3070 DocumentState::FromDataSource(datasource),
3071 ServiceWorkerNetworkProvider::CreateForNavigation( 3071 ServiceWorkerNetworkProvider::CreateForNavigation(
3072 routing_id_, navigation_state->request_params(), 3072 routing_id_, navigation_state->request_params(), frame,
3073 frame->effectiveSandboxFlags(), content_initiated)); 3073 content_initiated));
3074 } 3074 }
3075 3075
3076 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame, 3076 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame,
3077 double triggering_event_time) { 3077 double triggering_event_time) {
3078 DCHECK_EQ(frame_, frame); 3078 DCHECK_EQ(frame_, frame);
3079 WebDataSource* ds = frame->provisionalDataSource(); 3079 WebDataSource* ds = frame->provisionalDataSource();
3080 3080
3081 // In fast/loader/stop-provisional-loads.html, we abort the load before this 3081 // In fast/loader/stop-provisional-loads.html, we abort the load before this
3082 // callback is invoked. 3082 // callback is invoked.
3083 if (!ds) 3083 if (!ds)
(...skipping 3083 matching lines...) Expand 10 before | Expand all | Expand 10 after
6167 // event target. Potentially a Pepper plugin will receive the event. 6167 // event target. Potentially a Pepper plugin will receive the event.
6168 // In order to tell whether a plugin gets the last mouse event and which it 6168 // In order to tell whether a plugin gets the last mouse event and which it
6169 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6169 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6170 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6170 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6171 // |pepper_last_mouse_event_target_|. 6171 // |pepper_last_mouse_event_target_|.
6172 pepper_last_mouse_event_target_ = nullptr; 6172 pepper_last_mouse_event_target_ = nullptr;
6173 #endif 6173 #endif
6174 } 6174 }
6175 6175
6176 } // namespace content 6176 } // 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