diff options
Diffstat (limited to 'WebCore/xml')
| -rw-r--r-- | WebCore/xml/XMLHttpRequest.cpp | 4 | ||||
| -rw-r--r-- | WebCore/xml/XSLTProcessorLibxslt.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/xml/XMLHttpRequest.cpp b/WebCore/xml/XMLHttpRequest.cpp index afab73d..43ee8a8 100644 --- a/WebCore/xml/XMLHttpRequest.cpp +++ b/WebCore/xml/XMLHttpRequest.cpp @@ -23,7 +23,7 @@ #include "XMLHttpRequest.h" #include "Blob.h" -#include "Cache.h" +#include "MemoryCache.h" #include "CrossOriginAccessControl.h" #include "DOMFormData.h" #include "DOMImplementation.h" @@ -600,7 +600,7 @@ void XMLHttpRequest::createRequest(ExceptionCode& ec) setPendingActivity(this); // For now we should only balance the nonCached request count for main-thread XHRs and not - // Worker XHRs, as the Cache is not thread-safe. + // Worker XHRs, as the MemoryCache is not thread-safe. // This will become irrelevant after https://bugs.webkit.org/show_bug.cgi?id=27165 is resolved. if (!scriptExecutionContext()->isWorkerContext()) { ASSERT(isMainThread()); diff --git a/WebCore/xml/XSLTProcessorLibxslt.cpp b/WebCore/xml/XSLTProcessorLibxslt.cpp index c2869c7..a307c21 100644 --- a/WebCore/xml/XSLTProcessorLibxslt.cpp +++ b/WebCore/xml/XSLTProcessorLibxslt.cpp @@ -117,10 +117,10 @@ static xmlDocPtr docLoaderFunc(const xmlChar* uri, Vector<char> data; - bool requestAllowed = globalCachedResourceLoader->frame() && globalCachedResourceLoader->doc()->securityOrigin()->canRequest(url); + bool requestAllowed = globalCachedResourceLoader->frame() && globalCachedResourceLoader->document()->securityOrigin()->canRequest(url); if (requestAllowed) { globalCachedResourceLoader->frame()->loader()->loadResourceSynchronously(url, AllowStoredCredentials, error, response, data); - requestAllowed = globalCachedResourceLoader->doc()->securityOrigin()->canRequest(response.url()); + requestAllowed = globalCachedResourceLoader->document()->securityOrigin()->canRequest(response.url()); } if (!requestAllowed) { data.clear(); |