| OLD | NEW |
| 1 /* | 1 /* |
| 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) | 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) |
| 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) | 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) |
| 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) | 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) |
| 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All | 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All |
| 6 rights reserved. | 6 rights reserved. |
| 7 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ | 7 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ |
| 8 | 8 |
| 9 This library is free software; you can redistribute it and/or | 9 This library is free software; you can redistribute it and/or |
| 10 modify it under the terms of the GNU Library General Public | 10 modify it under the terms of the GNU Library General Public |
| (...skipping 1240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1251 // once dispatchWillSendRequest() takes const ResourceRequest. | 1251 // once dispatchWillSendRequest() takes const ResourceRequest. |
| 1252 // crbug.com/632580 | 1252 // crbug.com/632580 |
| 1253 resource->setResourceRequest(request); | 1253 resource->setResourceRequest(request); |
| 1254 | 1254 |
| 1255 // Resource requests from suborigins should not be intercepted by the service | 1255 // Resource requests from suborigins should not be intercepted by the service |
| 1256 // worker of the physical origin. This has the effect that, for now, | 1256 // worker of the physical origin. This has the effect that, for now, |
| 1257 // suborigins do not work with service workers. See | 1257 // suborigins do not work with service workers. See |
| 1258 // https://w3c.github.io/webappsec-suborigins/. | 1258 // https://w3c.github.io/webappsec-suborigins/. |
| 1259 SecurityOrigin* sourceOrigin = context().getSecurityOrigin(); | 1259 SecurityOrigin* sourceOrigin = context().getSecurityOrigin(); |
| 1260 if (sourceOrigin && sourceOrigin->hasSuborigin()) | 1260 if (sourceOrigin && sourceOrigin->hasSuborigin()) |
| 1261 request.setSkipServiceWorker(WebURLRequest::SkipServiceWorker::All); | 1261 request.setServiceWorkerMode(WebURLRequest::ServiceWorkerMode::None); |
| 1262 | 1262 |
| 1263 ResourceLoader* loader = ResourceLoader::create(this, resource); | 1263 ResourceLoader* loader = ResourceLoader::create(this, resource); |
| 1264 if (resource->shouldBlockLoadEvent()) | 1264 if (resource->shouldBlockLoadEvent()) |
| 1265 m_loaders.insert(loader); | 1265 m_loaders.insert(loader); |
| 1266 else | 1266 else |
| 1267 m_nonBlockingLoaders.insert(loader); | 1267 m_nonBlockingLoaders.insert(loader); |
| 1268 | 1268 |
| 1269 storePerformanceTimingInitiatorInformation(resource); | 1269 storePerformanceTimingInitiatorInformation(resource); |
| 1270 resource->setFetcherSecurityOrigin(sourceOrigin); | 1270 resource->setFetcherSecurityOrigin(sourceOrigin); |
| 1271 | 1271 |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1549 visitor->trace(m_context); | 1549 visitor->trace(m_context); |
| 1550 visitor->trace(m_archive); | 1550 visitor->trace(m_archive); |
| 1551 visitor->trace(m_loaders); | 1551 visitor->trace(m_loaders); |
| 1552 visitor->trace(m_nonBlockingLoaders); | 1552 visitor->trace(m_nonBlockingLoaders); |
| 1553 visitor->trace(m_documentResources); | 1553 visitor->trace(m_documentResources); |
| 1554 visitor->trace(m_preloads); | 1554 visitor->trace(m_preloads); |
| 1555 visitor->trace(m_resourceTimingInfoMap); | 1555 visitor->trace(m_resourceTimingInfoMap); |
| 1556 } | 1556 } |
| 1557 | 1557 |
| 1558 } // namespace blink | 1558 } // namespace blink |
| OLD | NEW |