| OLD | NEW |
| 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 3155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3166 | 3166 |
| 3167 // Create the serviceworker's per-document network observing object if it | 3167 // Create the serviceworker's per-document network observing object if it |
| 3168 // does not exist (When navigation happens within a page, the provider already | 3168 // does not exist (When navigation happens within a page, the provider already |
| 3169 // exists). | 3169 // exists). |
| 3170 if (ServiceWorkerNetworkProvider::FromDocumentState( | 3170 if (ServiceWorkerNetworkProvider::FromDocumentState( |
| 3171 DocumentState::FromDataSource(datasource))) | 3171 DocumentState::FromDataSource(datasource))) |
| 3172 return; | 3172 return; |
| 3173 | 3173 |
| 3174 ServiceWorkerNetworkProvider::AttachToDocumentState( | 3174 ServiceWorkerNetworkProvider::AttachToDocumentState( |
| 3175 DocumentState::FromDataSource(datasource), | 3175 DocumentState::FromDataSource(datasource), |
| 3176 ServiceWorkerNetworkProvider::CreateForNavigation( | 3176 ServiceWorkerNetworkProvider::CreateForNavigation(routing_id_, frame, |
| 3177 routing_id_, navigation_state->request_params(), frame, | 3177 content_initiated)); |
| 3178 content_initiated)); | |
| 3179 } | 3178 } |
| 3180 | 3179 |
| 3181 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame, | 3180 void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame, |
| 3182 double triggering_event_time) { | 3181 double triggering_event_time) { |
| 3183 DCHECK_EQ(frame_, frame); | 3182 DCHECK_EQ(frame_, frame); |
| 3184 WebDataSource* ds = frame->provisionalDataSource(); | 3183 WebDataSource* ds = frame->provisionalDataSource(); |
| 3185 | 3184 |
| 3186 // In fast/loader/stop-provisional-loads.html, we abort the load before this | 3185 // In fast/loader/stop-provisional-loads.html, we abort the load before this |
| 3187 // callback is invoked. | 3186 // callback is invoked. |
| 3188 if (!ds) | 3187 if (!ds) |
| (...skipping 3097 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6286 // event target. Potentially a Pepper plugin will receive the event. | 6285 // event target. Potentially a Pepper plugin will receive the event. |
| 6287 // In order to tell whether a plugin gets the last mouse event and which it | 6286 // In order to tell whether a plugin gets the last mouse event and which it |
| 6288 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6287 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6289 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6288 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6290 // |pepper_last_mouse_event_target_|. | 6289 // |pepper_last_mouse_event_target_|. |
| 6291 pepper_last_mouse_event_target_ = nullptr; | 6290 pepper_last_mouse_event_target_ = nullptr; |
| 6292 #endif | 6291 #endif |
| 6293 } | 6292 } |
| 6294 | 6293 |
| 6295 } // namespace content | 6294 } // namespace content |
| OLD | NEW |