| Index: Source/web/AssociatedURLLoader.cpp
|
| diff --git a/Source/web/AssociatedURLLoader.cpp b/Source/web/AssociatedURLLoader.cpp
|
| index 34c5bcfa04cdc34566ab821c62d29a768a3c0f11..2d6cfa86c028f9c58cc6f9ca384b76b046fd7869 100644
|
| --- a/Source/web/AssociatedURLLoader.cpp
|
| +++ b/Source/web/AssociatedURLLoader.cpp
|
| @@ -50,7 +50,7 @@
|
| #include "wtf/HashSet.h"
|
| #include "wtf/text/WTFString.h"
|
|
|
| -using namespace WebCore;
|
| +using namespace blink;
|
| using namespace WTF;
|
|
|
| namespace blink {
|
| @@ -300,7 +300,7 @@ AssociatedURLLoader::~AssociatedURLLoader()
|
| }
|
|
|
| #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \
|
| - COMPILE_ASSERT(static_cast<int>(blink::webkit_name) == static_cast<int>(WebCore::webcore_name), mismatching_enums)
|
| + COMPILE_ASSERT(static_cast<int>(blink::webkit_name) == static_cast<int>(blink::webcore_name), mismatching_enums)
|
|
|
| COMPILE_ASSERT_MATCHING_ENUM(WebURLLoaderOptions::CrossOriginRequestPolicyDeny, DenyCrossOriginRequests);
|
| COMPILE_ASSERT_MATCHING_ENUM(WebURLLoaderOptions::CrossOriginRequestPolicyUseAccessControl, UseAccessControl);
|
| @@ -339,8 +339,8 @@ void AssociatedURLLoader::loadAsynchronously(const WebURLRequest& request, WebUR
|
|
|
| if (allowLoad) {
|
| ThreadableLoaderOptions options;
|
| - options.preflightPolicy = static_cast<WebCore::PreflightPolicy>(m_options.preflightPolicy);
|
| - options.crossOriginRequestPolicy = static_cast<WebCore::CrossOriginRequestPolicy>(m_options.crossOriginRequestPolicy);
|
| + options.preflightPolicy = static_cast<blink::PreflightPolicy>(m_options.preflightPolicy);
|
| + options.crossOriginRequestPolicy = static_cast<blink::CrossOriginRequestPolicy>(m_options.crossOriginRequestPolicy);
|
|
|
| ResourceLoaderOptions resourceLoaderOptions;
|
| resourceLoaderOptions.sniffContent = m_options.sniffContent ? SniffContent : DoNotSniffContent;
|
|
|