[CSS Shapes] CORS-enabled fetch for shape image values

[WebKit-https.git] / Source / WebCore / loader / ResourceLoaderOptions.h

diff --git a/Source/WebCore/loader/ResourceLoaderOptions.h b/Source/WebCore/loader/ResourceLoaderOptions.h
index a290ad7..8e1b74d 100644 (file)
--- a/Source/WebCore/loader/ResourceLoaderOptions.h
+++ b/Source/WebCore/loader/ResourceLoaderOptions.h
@@ -31,7 +31,7 @@
 #ifndef ResourceLoaderOptions_h
 #define ResourceLoaderOptions_h
 
 #ifndef ResourceLoaderOptions_h
 #define ResourceLoaderOptions_h
 

-#include "ResourceHandle.h"
+#include "ResourceHandleTypes.h"

 
 namespace WebCore {
     
 
 namespace WebCore {
     


@@ -50,33 +50,46 @@ enum DataBufferingPolicy {
     DoNotBufferData
 };
 
     DoNotBufferData
 };
 

-enum ClientCrossOriginCredentialPolicy {
-    AskClientForCrossOriginCredentials,
-    DoNotAskClientForCrossOriginCredentials
-};
-

 enum SecurityCheckPolicy {
     SkipSecurityCheck,
     DoSecurityCheck
 };
 
 enum SecurityCheckPolicy {
     SkipSecurityCheck,
     DoSecurityCheck
 };
 

+enum RequestOriginPolicy {
+    UseDefaultOriginRestrictionsForType,
+    RestrictToSameOrigin,
+    PotentiallyCrossOriginEnabled // Indicates "potentially CORS-enabled fetch" in HTML standard.
+};
+

 struct ResourceLoaderOptions {
 struct ResourceLoaderOptions {

-    ResourceLoaderOptions() : sendLoadCallbacks(DoNotSendCallbacks), sniffContent(DoNotSniffContent), shouldBufferData(BufferData), allowCredentials(DoNotAllowStoredCredentials), crossOriginCredentialPolicy(DoNotAskClientForCrossOriginCredentials), securityCheck(DoSecurityCheck) { }
-    ResourceLoaderOptions(SendCallbackPolicy sendLoadCallbacks, ContentSniffingPolicy sniffContent, DataBufferingPolicy shouldBufferData, StoredCredentials allowCredentials, ClientCrossOriginCredentialPolicy crossOriginCredentialPolicy, SecurityCheckPolicy securityCheck)
+    ResourceLoaderOptions()
+        : sendLoadCallbacks(DoNotSendCallbacks)
+        , sniffContent(DoNotSniffContent)
+        , dataBufferingPolicy(BufferData)
+        , allowCredentials(DoNotAllowStoredCredentials)
+        , clientCredentialPolicy(DoNotAskClientForAnyCredentials)
+        , securityCheck(DoSecurityCheck)
+        , requestOriginPolicy(UseDefaultOriginRestrictionsForType)
+    {
+    }
+
+    ResourceLoaderOptions(SendCallbackPolicy sendLoadCallbacks, ContentSniffingPolicy sniffContent, DataBufferingPolicy dataBufferingPolicy, StoredCredentials allowCredentials, ClientCredentialPolicy credentialPolicy, SecurityCheckPolicy securityCheck, RequestOriginPolicy requestOriginPolicy)

         : sendLoadCallbacks(sendLoadCallbacks)
         , sniffContent(sniffContent)
         : sendLoadCallbacks(sendLoadCallbacks)
         , sniffContent(sniffContent)

-        , shouldBufferData(shouldBufferData)
+        , dataBufferingPolicy(dataBufferingPolicy)

         , allowCredentials(allowCredentials)
         , allowCredentials(allowCredentials)

-        , crossOriginCredentialPolicy(crossOriginCredentialPolicy)
+        , clientCredentialPolicy(credentialPolicy)

         , securityCheck(securityCheck)
         , securityCheck(securityCheck)

+        , requestOriginPolicy(requestOriginPolicy)

     {
     }
     SendCallbackPolicy sendLoadCallbacks;
     ContentSniffingPolicy sniffContent;
     {
     }
     SendCallbackPolicy sendLoadCallbacks;
     ContentSniffingPolicy sniffContent;

-    DataBufferingPolicy shouldBufferData;
+    DataBufferingPolicy dataBufferingPolicy;

     StoredCredentials allowCredentials; // Whether HTTP credentials and cookies are sent with the request.
     StoredCredentials allowCredentials; // Whether HTTP credentials and cookies are sent with the request.

-    ClientCrossOriginCredentialPolicy crossOriginCredentialPolicy; // Whether we will ask the client for credentials (if we allow credentials at all).
+    ClientCredentialPolicy clientCredentialPolicy; // When we should ask the client for credentials (if we allow credentials at all).

     SecurityCheckPolicy securityCheck;
     SecurityCheckPolicy securityCheck;

+    RequestOriginPolicy requestOriginPolicy;

 };
 
 } // namespace WebCore    
 };
 
 } // namespace WebCore