Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Side by Side Diff: Source/core/fetch/FetchRequest.h

Issue 47923008: Block execution of failed 'crossorigin' <script>s. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/dom/ScriptLoader.cpp ('k') | Source/core/fetch/FetchRequest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google, Inc. All rights reserved. 2 * Copyright (C) 2012 Google, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 21 matching lines...) Expand all
32 #include "platform/network/ResourceLoadPriority.h" 32 #include "platform/network/ResourceLoadPriority.h"
33 #include "platform/network/ResourceRequest.h" 33 #include "platform/network/ResourceRequest.h"
34 #include "wtf/text/AtomicString.h" 34 #include "wtf/text/AtomicString.h"
35 35
36 namespace WebCore { 36 namespace WebCore {
37 class SecurityOrigin; 37 class SecurityOrigin;
38 38
39 class FetchRequest { 39 class FetchRequest {
40 public: 40 public:
41 enum DeferOption { NoDefer, DeferredByClient }; 41 enum DeferOption { NoDefer, DeferredByClient };
42 enum OriginRestriction { UseDefaultOriginRestrictionForType, RestrictToSameO rigin };
42 43
43 explicit FetchRequest(const ResourceRequest&, const AtomicString& initiator, const String& charset = String(), ResourceLoadPriority = ResourceLoadPriorityUn resolved); 44 explicit FetchRequest(const ResourceRequest&, const AtomicString& initiator, const String& charset = String(), ResourceLoadPriority = ResourceLoadPriorityUn resolved);
44 FetchRequest(const ResourceRequest&, const AtomicString& initiator, const Re sourceLoaderOptions&); 45 FetchRequest(const ResourceRequest&, const AtomicString& initiator, const Re sourceLoaderOptions&);
45 FetchRequest(const ResourceRequest&, const FetchInitiatorInfo&); 46 FetchRequest(const ResourceRequest&, const FetchInitiatorInfo&);
46 ~FetchRequest(); 47 ~FetchRequest();
47 48
48 ResourceRequest& mutableResourceRequest() { return m_resourceRequest; } 49 ResourceRequest& mutableResourceRequest() { return m_resourceRequest; }
49 const ResourceRequest& resourceRequest() const { return m_resourceRequest; } 50 const ResourceRequest& resourceRequest() const { return m_resourceRequest; }
50 const KURL& url() const { return m_resourceRequest.url(); } 51 const KURL& url() const { return m_resourceRequest.url(); }
51 const String& charset() const { return m_charset; } 52 const String& charset() const { return m_charset; }
52 void setCharset(const String& charset) { m_charset = charset; } 53 void setCharset(const String& charset) { m_charset = charset; }
53 const ResourceLoaderOptions& options() const { return m_options; } 54 const ResourceLoaderOptions& options() const { return m_options; }
54 void setOptions(const ResourceLoaderOptions& options) { m_options = options; } 55 void setOptions(const ResourceLoaderOptions& options) { m_options = options; }
55 ResourceLoadPriority priority() const { return m_priority; } 56 ResourceLoadPriority priority() const { return m_priority; }
56 bool forPreload() const { return m_forPreload; } 57 bool forPreload() const { return m_forPreload; }
57 void setForPreload(bool forPreload) { m_forPreload = forPreload; } 58 void setForPreload(bool forPreload) { m_forPreload = forPreload; }
58 DeferOption defer() const { return m_defer; } 59 DeferOption defer() const { return m_defer; }
59 void setDefer(DeferOption defer) { m_defer = defer; } 60 void setDefer(DeferOption defer) { m_defer = defer; }
60 void setContentSecurityCheck(ContentSecurityPolicyCheck contentSecurityPolic yOption) { m_options.contentSecurityPolicyOption = contentSecurityPolicyOption; } 61 void setContentSecurityCheck(ContentSecurityPolicyCheck contentSecurityPolic yOption) { m_options.contentSecurityPolicyOption = contentSecurityPolicyOption; }
61 void setPotentiallyCrossOriginEnabled(SecurityOrigin*, StoredCredentials); 62 void setCrossOriginAccessControl(SecurityOrigin*, StoredCredentials);
63 OriginRestriction originRestriction() const { return m_originRestriction; }
64 void setOriginRestriction(OriginRestriction restriction) { m_originRestricti on = restriction; }
62 65
63 private: 66 private:
64 ResourceRequest m_resourceRequest; 67 ResourceRequest m_resourceRequest;
65 String m_charset; 68 String m_charset;
66 ResourceLoaderOptions m_options; 69 ResourceLoaderOptions m_options;
67 ResourceLoadPriority m_priority; 70 ResourceLoadPriority m_priority;
68 bool m_forPreload; 71 bool m_forPreload;
69 DeferOption m_defer; 72 DeferOption m_defer;
73 OriginRestriction m_originRestriction;
70 }; 74 };
71 75
72 } // namespace WebCore 76 } // namespace WebCore
73 77
74 #endif 78 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/ScriptLoader.cpp ('k') | Source/core/fetch/FetchRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698