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

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

Issue 600393004: [ServiceWorker] Set FetchRequestMode and handle wasFetchedViaServiceWorker. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: delete fetch-cors-xhr-expected.txt Created 6 years, 2 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
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 m_options.initiatorInfo = initiator; 65 m_options.initiatorInfo = initiator;
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, CredentialRequest requested) 72 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, StoredCre dentials allowCredentials, CredentialRequest requested)
73 { 73 {
74 ASSERT(requested == ClientDidNotRequestCredentials || allowCredentials == Al lowStoredCredentials); 74 ASSERT(requested == ClientDidNotRequestCredentials || allowCredentials == Al lowStoredCredentials);
75 m_resourceRequest.setFetchRequestMode(WebURLRequest::FetchRequestModeCORS);
75 updateRequestForAccessControl(m_resourceRequest, origin, allowCredentials); 76 updateRequestForAccessControl(m_resourceRequest, origin, allowCredentials);
76 m_options.allowCredentials = allowCredentials; 77 m_options.allowCredentials = allowCredentials;
77 m_options.corsEnabled = IsCORSEnabled; 78 m_options.corsEnabled = IsCORSEnabled;
78 m_options.securityOrigin = origin; 79 m_options.securityOrigin = origin;
79 m_options.credentialsRequested = requested; 80 m_options.credentialsRequested = requested;
80 } 81 }
81 82
82 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, StoredCre dentials allowCredentials) 83 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, StoredCre dentials allowCredentials)
83 { 84 {
84 setCrossOriginAccessControl(origin, allowCredentials, allowCredentials == Al lowStoredCredentials ? ClientRequestedCredentials : ClientDidNotRequestCredentia ls); 85 setCrossOriginAccessControl(origin, allowCredentials, allowCredentials == Al lowStoredCredentials ? ClientRequestedCredentials : ClientDidNotRequestCredentia ls);
85 } 86 }
86 87
87 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, const Ato micString& crossOriginMode) 88 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, const Ato micString& crossOriginMode)
88 { 89 {
89 setCrossOriginAccessControl(origin, equalIgnoringCase(crossOriginMode, "use- credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials); 90 setCrossOriginAccessControl(origin, equalIgnoringCase(crossOriginMode, "use- credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials);
90 } 91 }
91 92
92 } // namespace blink 93 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/http/tests/serviceworker/resources/test-helpers.js ('k') | Source/core/fetch/ResourceFetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698