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

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: review comments 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 3043 matching lines...) Expand 10 before | Expand all | Expand 10 after
3054 // Create the serviceworker's per-document network observing object if it 3054 // Create the serviceworker's per-document network observing object if it
3055 // does not exist (When navigation happens within a page, the provider already 3055 // does not exist (When navigation happens within a page, the provider already
3056 // exists). 3056 // exists).
3057 if (ServiceWorkerNetworkProvider::FromDocumentState( 3057 if (ServiceWorkerNetworkProvider::FromDocumentState(
3058 DocumentState::FromDataSource(datasource))) 3058 DocumentState::FromDataSource(datasource)))
3059 return; 3059 return;
3060 3060
3061 ServiceWorkerNetworkProvider::AttachToDocumentState( 3061 ServiceWorkerNetworkProvider::AttachToDocumentState(
3062 DocumentState::FromDataSource(datasource), 3062 DocumentState::FromDataSource(datasource),
3063 ServiceWorkerNetworkProvider::CreateForNavigation( 3063 ServiceWorkerNetworkProvider::CreateForNavigation(
3064 routing_id_, navigation_state->request_params(), 3064 routing_id_, navigation_state->request_params(), frame,
3065 frame->effectiveSandboxFlags(), content_initiated)); 3065 content_initiated));
3066 } 3066 }
3067 3067
3068 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame, 3068 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame,
3069 double triggering_event_time) { 3069 double triggering_event_time) {
3070 DCHECK_EQ(frame_, frame); 3070 DCHECK_EQ(frame_, frame);
3071 WebDataSource* ds = frame->provisionalDataSource(); 3071 WebDataSource* ds = frame->provisionalDataSource();
3072 3072
3073 // In fast/loader/stop-provisional-loads.html, we abort the load before this 3073 // In fast/loader/stop-provisional-loads.html, we abort the load before this
3074 // callback is invoked. 3074 // callback is invoked.
3075 if (!ds) 3075 if (!ds)
(...skipping 3078 matching lines...) Expand 10 before | Expand all | Expand 10 after
6154 // event target. Potentially a Pepper plugin will receive the event. 6154 // event target. Potentially a Pepper plugin will receive the event.
6155 // In order to tell whether a plugin gets the last mouse event and which it 6155 // In order to tell whether a plugin gets the last mouse event and which it
6156 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6156 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6157 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6157 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6158 // |pepper_last_mouse_event_target_|. 6158 // |pepper_last_mouse_event_target_|.
6159 pepper_last_mouse_event_target_ = nullptr; 6159 pepper_last_mouse_event_target_ = nullptr;
6160 #endif 6160 #endif
6161 } 6161 }
6162 6162
6163 } // namespace content 6163 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698