diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
| commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
| tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp | |
| parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
| download | WebKitGtk-tarball-master.tar.gz | |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp')
| -rw-r--r-- | Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp b/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp index 116f20e88..a9bf7c66e 100644 --- a/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp +++ b/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp @@ -26,7 +26,6 @@ #include "config.h" #include "CachedSVGDocumentReference.h" -#if ENABLE(SVG) && ENABLE(CSS_FILTERS) #include "CachedResourceHandle.h" #include "CachedResourceLoader.h" #include "CachedResourceRequest.h" @@ -37,7 +36,7 @@ namespace WebCore { CachedSVGDocumentReference::CachedSVGDocumentReference(const String& url) : m_url(url) - , m_document(0) + , m_document(nullptr) , m_loadRequested(false) { } @@ -45,24 +44,23 @@ CachedSVGDocumentReference::CachedSVGDocumentReference(const String& url) CachedSVGDocumentReference::~CachedSVGDocumentReference() { if (m_document) - m_document->removeClient(this); + m_document->removeClient(*this); } -void CachedSVGDocumentReference::load(CachedResourceLoader* loader) +void CachedSVGDocumentReference::load(CachedResourceLoader& loader, const ResourceLoaderOptions& options) { - ASSERT(loader); if (m_loadRequested) return; - CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(m_url))); + auto fetchOptions = options; + fetchOptions.mode = FetchOptions::Mode::SameOrigin; + CachedResourceRequest request(ResourceRequest(loader.document()->completeURL(m_url)), fetchOptions); request.setInitiator(cachedResourceRequestInitiators().css); - m_document = loader->requestSVGDocument(request); + m_document = loader.requestSVGDocument(WTFMove(request)); if (m_document) - m_document->addClient(this); + m_document->addClient(*this); m_loadRequested = true; } } - -#endif |