| 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 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 474 const ResourceFactory& factory, | 474 const ResourceFactory& factory, |
| 475 const SubstituteData& substituteData) { | 475 const SubstituteData& substituteData) { |
| 476 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Fetch.RequestResourceTime"); | 476 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Fetch.RequestResourceTime"); |
| 477 DCHECK(request.options().synchronousPolicy == RequestAsynchronously || | 477 DCHECK(request.options().synchronousPolicy == RequestAsynchronously || |
| 478 factory.type() == Resource::Raw || | 478 factory.type() == Resource::Raw || |
| 479 factory.type() == Resource::XSLStyleSheet); | 479 factory.type() == Resource::XSLStyleSheet); |
| 480 | 480 |
| 481 context().populateRequestData(request.mutableResourceRequest()); | 481 context().populateRequestData(request.mutableResourceRequest()); |
| 482 if (request.resourceRequest().httpHeaderField("Upgrade-Insecure-Requests") != | 482 if (request.resourceRequest().httpHeaderField("Upgrade-Insecure-Requests") != |
| 483 AtomicString("1")) | 483 AtomicString("1")) |
| 484 context().upgradeInsecureRequest(request.mutableResourceRequest()); | 484 context().modifyRequestForCSP(request.mutableResourceRequest()); |
| 485 context().addClientHintsIfNecessary(request); | 485 context().addClientHintsIfNecessary(request); |
| 486 context().addCSPHeaderIfNecessary(factory.type(), request); | 486 context().addCSPHeaderIfNecessary(factory.type(), request); |
| 487 | 487 |
| 488 TRACE_EVENT1("blink", "ResourceFetcher::requestResource", "url", | 488 TRACE_EVENT1("blink", "ResourceFetcher::requestResource", "url", |
| 489 urlForTraceEvent(request.url())); | 489 urlForTraceEvent(request.url())); |
| 490 | 490 |
| 491 if (!request.url().isValid()) | 491 if (!request.url().isValid()) |
| 492 return nullptr; | 492 return nullptr; |
| 493 | 493 |
| 494 if (!context().canRequest( | 494 if (!context().canRequest( |
| (...skipping 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1592 visitor->trace(m_context); | 1592 visitor->trace(m_context); |
| 1593 visitor->trace(m_archive); | 1593 visitor->trace(m_archive); |
| 1594 visitor->trace(m_loaders); | 1594 visitor->trace(m_loaders); |
| 1595 visitor->trace(m_nonBlockingLoaders); | 1595 visitor->trace(m_nonBlockingLoaders); |
| 1596 visitor->trace(m_documentResources); | 1596 visitor->trace(m_documentResources); |
| 1597 visitor->trace(m_preloads); | 1597 visitor->trace(m_preloads); |
| 1598 visitor->trace(m_resourceTimingInfoMap); | 1598 visitor->trace(m_resourceTimingInfoMap); |
| 1599 } | 1599 } |
| 1600 | 1600 |
| 1601 } // namespace blink | 1601 } // namespace blink |
| OLD | NEW |