| 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) 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 | 7 |
| 8 This library is free software; you can redistribute it and/or | 8 This library is free software; you can redistribute it and/or |
| 9 modify it under the terms of the GNU Library General Public | 9 modify it under the terms of the GNU Library General Public |
| 10 License as published by the Free Software Foundation; either | 10 License as published by the Free Software Foundation; either |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "core/fetch/FetchRequest.h" | 29 #include "core/fetch/FetchRequest.h" |
| 30 #include "core/fetch/IntegrityMetadata.h" | 30 #include "core/fetch/IntegrityMetadata.h" |
| 31 #include "core/fetch/ResourceClientOrObserverWalker.h" | 31 #include "core/fetch/ResourceClientOrObserverWalker.h" |
| 32 #include "core/fetch/ResourceFetcher.h" | 32 #include "core/fetch/ResourceFetcher.h" |
| 33 #include "platform/MIMETypeRegistry.h" | 33 #include "platform/MIMETypeRegistry.h" |
| 34 #include "platform/SharedBuffer.h" | 34 #include "platform/SharedBuffer.h" |
| 35 #include "public/platform/WebProcessMemoryDump.h" | 35 #include "public/platform/WebProcessMemoryDump.h" |
| 36 | 36 |
| 37 namespace blink { | 37 namespace blink { |
| 38 | 38 |
| 39 PassRefPtrWillBeRawPtr<ScriptResource> ScriptResource::fetch(FetchRequest& reque
st, ResourceFetcher* fetcher) | 39 RawPtr<ScriptResource> ScriptResource::fetch(FetchRequest& request, ResourceFetc
her* fetcher) |
| 40 { | 40 { |
| 41 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone
); | 41 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone
); |
| 42 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon
textScript); | 42 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon
textScript); |
| 43 RefPtrWillBeRawPtr<ScriptResource> resource = toScriptResource(fetcher->requ
estResource(request, ScriptResourceFactory())); | 43 RawPtr<ScriptResource> resource = toScriptResource(fetcher->requestResource(
request, ScriptResourceFactory())); |
| 44 if (resource && !request.integrityMetadata().isEmpty()) | 44 if (resource && !request.integrityMetadata().isEmpty()) |
| 45 resource->setIntegrityMetadata(request.integrityMetadata()); | 45 resource->setIntegrityMetadata(request.integrityMetadata()); |
| 46 return resource.release(); | 46 return resource.release(); |
| 47 } | 47 } |
| 48 | 48 |
| 49 ScriptResource::ScriptResource(const ResourceRequest& resourceRequest, const Res
ourceLoaderOptions& options, const String& charset) | 49 ScriptResource::ScriptResource(const ResourceRequest& resourceRequest, const Res
ourceLoaderOptions& options, const String& charset) |
| 50 : TextResource(resourceRequest, Script, options, "application/javascript", c
harset) | 50 : TextResource(resourceRequest, Script, options, "application/javascript", c
harset) |
| 51 , m_integrityDisposition(ScriptIntegrityDisposition::NotChecked) | 51 , m_integrityDisposition(ScriptIntegrityDisposition::NotChecked) |
| 52 { | 52 { |
| 53 DEFINE_STATIC_LOCAL(const AtomicString, acceptScript, ("*/*")); | 53 DEFINE_STATIC_LOCAL(const AtomicString, acceptScript, ("*/*")); |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 } | 120 } |
| 121 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque
st) const | 121 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque
st) const |
| 122 { | 122 { |
| 123 if (request.integrityMetadata().isEmpty()) | 123 if (request.integrityMetadata().isEmpty()) |
| 124 return false; | 124 return false; |
| 125 | 125 |
| 126 return !IntegrityMetadata::setsEqual(m_integrityMetadata, request.integrityM
etadata()); | 126 return !IntegrityMetadata::setsEqual(m_integrityMetadata, request.integrityM
etadata()); |
| 127 } | 127 } |
| 128 | 128 |
| 129 } // namespace blink | 129 } // namespace blink |
| OLD | NEW |