| Index: third_party/WebKit/Source/core/fetch/ResourceLoaderOptions.h
|
| diff --git a/third_party/WebKit/Source/core/fetch/ResourceLoaderOptions.h b/third_party/WebKit/Source/core/fetch/ResourceLoaderOptions.h
|
| index 1fb9193f63b0a72f7e64d934da2510144dc513b4..6d5b451fa448d0885f545139f46e44dbed606461 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ResourceLoaderOptions.h
|
| +++ b/third_party/WebKit/Source/core/fetch/ResourceLoaderOptions.h
|
| @@ -32,9 +32,9 @@
|
| #define ResourceLoaderOptions_h
|
|
|
| #include "core/fetch/FetchInitiatorInfo.h"
|
| -#include "platform/CrossThreadCopier.h"
|
| #include "platform/weborigin/SecurityOrigin.h"
|
| #include "wtf/Allocator.h"
|
| +#include "wtf/CrossThreadCopier.h"
|
|
|
| namespace blink {
|
|
|
| @@ -184,15 +184,19 @@ struct CrossThreadResourceLoaderOptionsData {
|
| String contentSecurityPolicyNonce;
|
| };
|
|
|
| +} // namespace blink
|
| +
|
| +namespace WTF {
|
| +
|
| template <>
|
| -struct CrossThreadCopier<ResourceLoaderOptions> {
|
| - using Type = CrossThreadResourceLoaderOptionsData;
|
| - static Type copy(const ResourceLoaderOptions& options)
|
| +struct CrossThreadCopier<blink::ResourceLoaderOptions> {
|
| + using Type = blink::CrossThreadResourceLoaderOptionsData;
|
| + static Type copy(const blink::ResourceLoaderOptions& options)
|
| {
|
| - return CrossThreadResourceLoaderOptionsData(options);
|
| + return blink::CrossThreadResourceLoaderOptionsData(options);
|
| }
|
| };
|
|
|
| -} // namespace blink
|
| +} // namespace WTF
|
|
|
| #endif // ResourceLoaderOptions_h
|
|
|