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 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
483 const ResourceFactory& factory, | 483 const ResourceFactory& factory, |
484 const SubstituteData& substituteData) { | 484 const SubstituteData& substituteData) { |
485 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Fetch.RequestResourceTime"); | 485 SCOPED_BLINK_UMA_HISTOGRAM_TIMER("Blink.Fetch.RequestResourceTime"); |
486 DCHECK(request.options().synchronousPolicy == RequestAsynchronously || | 486 DCHECK(request.options().synchronousPolicy == RequestAsynchronously || |
487 factory.type() == Resource::Raw || | 487 factory.type() == Resource::Raw || |
488 factory.type() == Resource::XSLStyleSheet); | 488 factory.type() == Resource::XSLStyleSheet); |
489 | 489 |
490 context().populateRequestData(request.mutableResourceRequest()); | 490 context().populateRequestData(request.mutableResourceRequest()); |
491 if (request.resourceRequest().httpHeaderField("Upgrade-Insecure-Requests") != | 491 if (request.resourceRequest().httpHeaderField("Upgrade-Insecure-Requests") != |
492 AtomicString("1")) | 492 AtomicString("1")) |
493 context().upgradeInsecureRequest(request.mutableResourceRequest()); | 493 context().modifyRequestForCSP(request.mutableResourceRequest()); |
494 context().addClientHintsIfNecessary(request); | 494 context().addClientHintsIfNecessary(request); |
495 context().addCSPHeaderIfNecessary(factory.type(), request); | 495 context().addCSPHeaderIfNecessary(factory.type(), request); |
496 | 496 |
497 TRACE_EVENT1("blink", "ResourceFetcher::requestResource", "url", | 497 TRACE_EVENT1("blink", "ResourceFetcher::requestResource", "url", |
498 urlForTraceEvent(request.url())); | 498 urlForTraceEvent(request.url())); |
499 | 499 |
500 if (!request.url().isValid()) | 500 if (!request.url().isValid()) |
501 return nullptr; | 501 return nullptr; |
502 | 502 |
503 if (!context().canRequest( | 503 if (!context().canRequest( |
(...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1604 visitor->trace(m_context); | 1604 visitor->trace(m_context); |
1605 visitor->trace(m_archive); | 1605 visitor->trace(m_archive); |
1606 visitor->trace(m_loaders); | 1606 visitor->trace(m_loaders); |
1607 visitor->trace(m_nonBlockingLoaders); | 1607 visitor->trace(m_nonBlockingLoaders); |
1608 visitor->trace(m_documentResources); | 1608 visitor->trace(m_documentResources); |
1609 visitor->trace(m_preloads); | 1609 visitor->trace(m_preloads); |
1610 visitor->trace(m_resourceTimingInfoMap); | 1610 visitor->trace(m_resourceTimingInfoMap); |
1611 } | 1611 } |
1612 | 1612 |
1613 } // namespace blink | 1613 } // namespace blink |
OLD | NEW |