| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Google Inc. All rights reserved. | 3 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 #include "platform/HTTPNames.h" | 61 #include "platform/HTTPNames.h" |
| 62 #include "platform/UserGestureIndicator.h" | 62 #include "platform/UserGestureIndicator.h" |
| 63 #include "platform/loader/fetch/FetchInitiatorTypeNames.h" | 63 #include "platform/loader/fetch/FetchInitiatorTypeNames.h" |
| 64 #include "platform/loader/fetch/FetchRequest.h" | 64 #include "platform/loader/fetch/FetchRequest.h" |
| 65 #include "platform/loader/fetch/FetchUtils.h" | 65 #include "platform/loader/fetch/FetchUtils.h" |
| 66 #include "platform/loader/fetch/MemoryCache.h" | 66 #include "platform/loader/fetch/MemoryCache.h" |
| 67 #include "platform/loader/fetch/ResourceFetcher.h" | 67 #include "platform/loader/fetch/ResourceFetcher.h" |
| 68 #include "platform/mhtml/ArchiveResource.h" | 68 #include "platform/mhtml/ArchiveResource.h" |
| 69 #include "platform/network/ContentSecurityPolicyResponseHeaders.h" | 69 #include "platform/network/ContentSecurityPolicyResponseHeaders.h" |
| 70 #include "platform/network/HTTPParsers.h" | 70 #include "platform/network/HTTPParsers.h" |
| 71 #include "platform/network/ResourceTimingInfo.h" |
| 71 #include "platform/network/mime/MIMETypeRegistry.h" | 72 #include "platform/network/mime/MIMETypeRegistry.h" |
| 72 #include "platform/plugins/PluginData.h" | 73 #include "platform/plugins/PluginData.h" |
| 73 #include "platform/weborigin/SchemeRegistry.h" | 74 #include "platform/weborigin/SchemeRegistry.h" |
| 74 #include "platform/weborigin/SecurityPolicy.h" | 75 #include "platform/weborigin/SecurityPolicy.h" |
| 75 #include "public/platform/Platform.h" | 76 #include "public/platform/Platform.h" |
| 76 #include "public/platform/modules/serviceworker/WebServiceWorkerNetworkProvider.
h" | 77 #include "public/platform/modules/serviceworker/WebServiceWorkerNetworkProvider.
h" |
| 77 #include "wtf/Assertions.h" | 78 #include "wtf/Assertions.h" |
| 78 #include "wtf/AutoReset.h" | 79 #include "wtf/AutoReset.h" |
| 79 #include "wtf/text/WTFString.h" | 80 #include "wtf/text/WTFString.h" |
| 80 | 81 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 visitor->trace(m_applicationCacheHost); | 160 visitor->trace(m_applicationCacheHost); |
| 160 visitor->trace(m_contentSecurityPolicy); | 161 visitor->trace(m_contentSecurityPolicy); |
| 161 RawResourceClient::trace(visitor); | 162 RawResourceClient::trace(visitor); |
| 162 } | 163 } |
| 163 | 164 |
| 164 unsigned long DocumentLoader::mainResourceIdentifier() const { | 165 unsigned long DocumentLoader::mainResourceIdentifier() const { |
| 165 return m_mainResource ? m_mainResource->identifier() : 0; | 166 return m_mainResource ? m_mainResource->identifier() : 0; |
| 166 } | 167 } |
| 167 | 168 |
| 168 ResourceTimingInfo* DocumentLoader::getNavigationTimingInfo() const { | 169 ResourceTimingInfo* DocumentLoader::getNavigationTimingInfo() const { |
| 170 DCHECK(fetcher()); |
| 169 return fetcher()->getNavigationTimingInfo(); | 171 return fetcher()->getNavigationTimingInfo(); |
| 170 } | 172 } |
| 171 | 173 |
| 172 const ResourceRequest& DocumentLoader::originalRequest() const { | 174 const ResourceRequest& DocumentLoader::originalRequest() const { |
| 173 return m_originalRequest; | 175 return m_originalRequest; |
| 174 } | 176 } |
| 175 | 177 |
| 176 const ResourceRequest& DocumentLoader::getRequest() const { | 178 const ResourceRequest& DocumentLoader::getRequest() const { |
| 177 return m_request; | 179 return m_request; |
| 178 } | 180 } |
| (...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 818 m_writer ? m_writer->encoding() : emptyAtom, true, | 820 m_writer ? m_writer->encoding() : emptyAtom, true, |
| 819 ForceSynchronousParsing); | 821 ForceSynchronousParsing); |
| 820 if (!source.isNull()) | 822 if (!source.isNull()) |
| 821 m_writer->appendReplacingData(source); | 823 m_writer->appendReplacingData(source); |
| 822 endWriting(); | 824 endWriting(); |
| 823 } | 825 } |
| 824 | 826 |
| 825 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); | 827 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader); |
| 826 | 828 |
| 827 } // namespace blink | 829 } // namespace blink |
| OLD | NEW |