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

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

Issue 186803005: [import] Use master document's origin to resolve CORS (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/http/tests/htmlimports/resources/cors-subimports.cgi ('k') | no next file » | 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 } 66 }
67 67
68 FetchRequest::~FetchRequest() 68 FetchRequest::~FetchRequest()
69 { 69 {
70 } 70 }
71 71
72 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, StoredCre dentials allowCredentials) 72 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, StoredCre dentials allowCredentials)
73 { 73 {
74 updateRequestForAccessControl(m_resourceRequest, origin, allowCredentials); 74 updateRequestForAccessControl(m_resourceRequest, origin, allowCredentials);
75 m_options.corsEnabled = IsCORSEnabled; 75 m_options.corsEnabled = IsCORSEnabled;
76 m_options.securityOrigin = origin;
76 } 77 }
77 78
78 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, const Ato micString& crossOriginMode) 79 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, const Ato micString& crossOriginMode)
79 { 80 {
80 StoredCredentials allowCredentials = equalIgnoringCase(crossOriginMode, "use -credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials; 81 setCrossOriginAccessControl(origin, equalIgnoringCase(crossOriginMode, "use- credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials);
81 updateRequestForAccessControl(m_resourceRequest, origin, allowCredentials);
82 m_options.corsEnabled = IsCORSEnabled;
83 } 82 }
84 83
85 } // namespace WebCore 84 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/htmlimports/resources/cors-subimports.cgi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698