| 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 14 matching lines...) Expand all Loading... |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "core/fetch/ScriptResource.h" | 27 #include "core/fetch/ScriptResource.h" |
| 28 | 28 |
| 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 "platform/WebProcessMemoryDump.h" | 35 #include "platform/web_memory_allocator_dump.h" |
| 36 #include "platform/web_process_memory_dump.h" |
| 36 | 37 |
| 37 namespace blink { | 38 namespace blink { |
| 38 | 39 |
| 39 ScriptResource* ScriptResource::fetch(FetchRequest& request, ResourceFetcher* fe
tcher) | 40 ScriptResource* ScriptResource::fetch(FetchRequest& request, ResourceFetcher* fe
tcher) |
| 40 { | 41 { |
| 41 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone
); | 42 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone
); |
| 42 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon
textScript); | 43 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon
textScript); |
| 43 ScriptResource* resource = toScriptResource(fetcher->requestResource(request
, ScriptResourceFactory())); | 44 ScriptResource* resource = toScriptResource(fetcher->requestResource(request
, ScriptResourceFactory())); |
| 44 if (resource && !request.integrityMetadata().isEmpty()) | 45 if (resource && !request.integrityMetadata().isEmpty()) |
| 45 resource->setIntegrityMetadata(request.integrityMetadata()); | 46 resource->setIntegrityMetadata(request.integrityMetadata()); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 } | 115 } |
| 115 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque
st) const | 116 bool ScriptResource::mustRefetchDueToIntegrityMetadata(const FetchRequest& reque
st) const |
| 116 { | 117 { |
| 117 if (request.integrityMetadata().isEmpty()) | 118 if (request.integrityMetadata().isEmpty()) |
| 118 return false; | 119 return false; |
| 119 | 120 |
| 120 return !IntegrityMetadata::setsEqual(m_integrityMetadata, request.integrityM
etadata()); | 121 return !IntegrityMetadata::setsEqual(m_integrityMetadata, request.integrityM
etadata()); |
| 121 } | 122 } |
| 122 | 123 |
| 123 } // namespace blink | 124 } // namespace blink |
| OLD | NEW |