| Index: third_party/WebKit/Source/core/html/parser/PreloadRequest.h
|
| diff --git a/third_party/WebKit/Source/core/html/parser/PreloadRequest.h b/third_party/WebKit/Source/core/html/parser/PreloadRequest.h
|
| index 5cceca0b6fc6bd56fd34e6499247eb1b7063a76d..465e8ae7c209a0406d148a61475cf21929de30a0 100644
|
| --- a/third_party/WebKit/Source/core/html/parser/PreloadRequest.h
|
| +++ b/third_party/WebKit/Source/core/html/parser/PreloadRequest.h
|
| @@ -8,6 +8,7 @@
|
| #include "core/fetch/ClientHintsPreferences.h"
|
| #include "core/fetch/FetchRequest.h"
|
| #include "core/fetch/Resource.h"
|
| +#include "platform/CrossOriginAttributeValue.h"
|
| #include "platform/weborigin/SecurityPolicy.h"
|
| #include "wtf/Allocator.h"
|
| #include "wtf/text/TextPosition.h"
|
| @@ -34,20 +35,20 @@ public:
|
| double discoveryTime() const { return m_discoveryTime; }
|
| void setDefer(FetchRequest::DeferOption defer) { m_defer = defer; }
|
| void setCharset(const String& charset) { m_charset = charset.isolatedCopy(); }
|
| - void setCrossOriginEnabled(StoredCredentials allowCredentials)
|
| + void setCrossOrigin(CrossOriginAttributeValue crossOrigin)
|
| {
|
| - m_isCORSEnabled = true;
|
| - m_allowCredentials = allowCredentials;
|
| + m_crossOrigin = crossOrigin;
|
| + }
|
| + CrossOriginAttributeValue crossOrigin() const
|
| + {
|
| + return m_crossOrigin;
|
| }
|
| -
|
| Resource::Type resourceType() const { return m_resourceType; }
|
|
|
| const String& resourceURL() const { return m_resourceURL; }
|
| float resourceWidth() const { return m_resourceWidth.isSet ? m_resourceWidth.width : 0; }
|
| const KURL& baseURL() const { return m_baseURL; }
|
| bool isPreconnect() const { return m_requestType == RequestTypePreconnect; }
|
| - bool isCORS() const { return m_isCORSEnabled; }
|
| - bool isAllowCredentials() const { return m_allowCredentials == AllowStoredCredentials; }
|
| const ClientHintsPreferences& preferences() const { return m_clientHintsPreferences; }
|
| ReferrerPolicy referrerPolicy() const { return m_referrerPolicy; }
|
|
|
| @@ -66,8 +67,7 @@ private:
|
| , m_resourceURL(resourceURL.isolatedCopy())
|
| , m_baseURL(baseURL.copy())
|
| , m_resourceType(resourceType)
|
| - , m_isCORSEnabled(false)
|
| - , m_allowCredentials(DoNotAllowStoredCredentials)
|
| + , m_crossOrigin(CrossOriginAttributeNotSet)
|
| , m_discoveryTime(monotonicallyIncreasingTime())
|
| , m_defer(FetchRequest::NoDefer)
|
| , m_resourceWidth(resourceWidth)
|
| @@ -85,8 +85,7 @@ private:
|
| KURL m_baseURL;
|
| String m_charset;
|
| Resource::Type m_resourceType;
|
| - bool m_isCORSEnabled;
|
| - StoredCredentials m_allowCredentials;
|
| + CrossOriginAttributeValue m_crossOrigin;
|
| double m_discoveryTime;
|
| FetchRequest::DeferOption m_defer;
|
| FetchRequest::ResourceWidth m_resourceWidth;
|
|
|