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

Side by Side Diff: third_party/WebKit/Source/modules/fetch/RequestInit.cpp

Issue 2772013002: Fetch API: Fix behavior when Request constructor is passed an undefined referrer (Closed)
Patch Set: update expectation + rebase Created 3 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
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/Dictionary.h ('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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/fetch/RequestInit.h" 5 #include "modules/fetch/RequestInit.h"
6 6
7 #include "bindings/core/v8/Dictionary.h" 7 #include "bindings/core/v8/Dictionary.h"
8 #include "bindings/core/v8/V8ArrayBuffer.h" 8 #include "bindings/core/v8/V8ArrayBuffer.h"
9 #include "bindings/core/v8/V8ArrayBufferView.h" 9 #include "bindings/core/v8/V8ArrayBufferView.h"
10 #include "bindings/core/v8/V8Binding.h" 10 #include "bindings/core/v8/V8Binding.h"
11 #include "bindings/core/v8/V8Blob.h" 11 #include "bindings/core/v8/V8Blob.h"
12 #include "bindings/core/v8/V8FormData.h" 12 #include "bindings/core/v8/V8FormData.h"
13 #include "bindings/core/v8/V8URLSearchParams.h" 13 #include "bindings/core/v8/V8URLSearchParams.h"
14 #include "bindings/modules/v8/V8PasswordCredential.h" 14 #include "bindings/modules/v8/V8PasswordCredential.h"
15 #include "core/dom/URLSearchParams.h" 15 #include "core/dom/URLSearchParams.h"
16 #include "core/fileapi/Blob.h" 16 #include "core/fileapi/Blob.h"
17 #include "core/html/FormData.h" 17 #include "core/html/FormData.h"
18 #include "modules/fetch/BlobBytesConsumer.h" 18 #include "modules/fetch/BlobBytesConsumer.h"
19 #include "modules/fetch/FormDataBytesConsumer.h" 19 #include "modules/fetch/FormDataBytesConsumer.h"
20 #include "modules/fetch/Headers.h" 20 #include "modules/fetch/Headers.h"
21 #include "platform/RuntimeEnabledFeatures.h" 21 #include "platform/RuntimeEnabledFeatures.h"
22 #include "platform/blob/BlobData.h" 22 #include "platform/blob/BlobData.h"
23 #include "platform/network/EncodedFormData.h" 23 #include "platform/network/EncodedFormData.h"
24 #include "platform/weborigin/ReferrerPolicy.h" 24 #include "platform/weborigin/ReferrerPolicy.h"
25 25
26 namespace blink { 26 namespace blink {
27 27
28 // TODO(yiyix): Verify if any DictionaryHelper::get should be replaced with
29 // DictionaryHelper::getWithUndefinedCheck.
28 RequestInit::RequestInit(ExecutionContext* context, 30 RequestInit::RequestInit(ExecutionContext* context,
29 const Dictionary& options, 31 const Dictionary& options,
30 ExceptionState& exceptionState) 32 ExceptionState& exceptionState)
31 : areAnyMembersSet(false) { 33 : areAnyMembersSet(false) {
32 areAnyMembersSet |= DictionaryHelper::get(options, "method", method); 34 areAnyMembersSet |= DictionaryHelper::get(options, "method", method);
33 areAnyMembersSet |= DictionaryHelper::get(options, "headers", headers); 35 areAnyMembersSet |= DictionaryHelper::get(options, "headers", headers);
34 if (!headers) { 36 if (!headers) {
35 Vector<Vector<String>> headersVector; 37 Vector<Vector<String>> headersVector;
36 if (DictionaryHelper::get(options, "headers", headersVector, 38 if (DictionaryHelper::get(options, "headers", headersVector,
37 exceptionState)) { 39 exceptionState)) {
38 headers = Headers::create(headersVector, exceptionState); 40 headers = Headers::create(headersVector, exceptionState);
39 areAnyMembersSet = true; 41 areAnyMembersSet = true;
40 } else { 42 } else {
41 areAnyMembersSet |= 43 areAnyMembersSet |=
42 DictionaryHelper::get(options, "headers", headersDictionary); 44 DictionaryHelper::get(options, "headers", headersDictionary);
43 } 45 }
44 } 46 }
45 areAnyMembersSet |= DictionaryHelper::get(options, "mode", mode); 47 areAnyMembersSet |= DictionaryHelper::get(options, "mode", mode);
46 areAnyMembersSet |= DictionaryHelper::get(options, "redirect", redirect); 48 areAnyMembersSet |= DictionaryHelper::get(options, "redirect", redirect);
47 AtomicString referrerString; 49 AtomicString referrerString;
48 bool isReferrerStringSet = 50 bool isReferrerStringSet = DictionaryHelper::getWithUndefinedCheck(
49 DictionaryHelper::get(options, "referrer", referrerString); 51 options, "referrer", referrerString);
50 areAnyMembersSet |= isReferrerStringSet; 52 areAnyMembersSet |= isReferrerStringSet;
51 areAnyMembersSet |= DictionaryHelper::get(options, "integrity", integrity); 53 areAnyMembersSet |= DictionaryHelper::get(options, "integrity", integrity);
52 AtomicString referrerPolicyString; 54 AtomicString referrerPolicyString;
53 bool isReferrerPolicySet = 55 bool isReferrerPolicySet =
54 DictionaryHelper::get(options, "referrerPolicy", referrerPolicyString); 56 DictionaryHelper::get(options, "referrerPolicy", referrerPolicyString);
55 areAnyMembersSet |= isReferrerPolicySet; 57 areAnyMembersSet |= isReferrerPolicySet;
56 58
57 v8::Local<v8::Value> v8Body; 59 v8::Local<v8::Value> v8Body;
58 bool isBodySet = DictionaryHelper::get(options, "body", v8Body); 60 bool isBodySet = DictionaryHelper::get(options, "body", v8Body);
59 areAnyMembersSet |= isBodySet; 61 areAnyMembersSet |= isBodySet;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 AtomicString("application/x-www-form-urlencoded;charset=UTF-8"); 150 AtomicString("application/x-www-form-urlencoded;charset=UTF-8");
149 body = new FormDataBytesConsumer(context, formData.release()); 151 body = new FormDataBytesConsumer(context, formData.release());
150 } else if (v8Body->IsString()) { 152 } else if (v8Body->IsString()) {
151 contentType = "text/plain;charset=UTF-8"; 153 contentType = "text/plain;charset=UTF-8";
152 body = 154 body =
153 new FormDataBytesConsumer(toUSVString(isolate, v8Body, exceptionState)); 155 new FormDataBytesConsumer(toUSVString(isolate, v8Body, exceptionState));
154 } 156 }
155 } 157 }
156 158
157 } // namespace blink 159 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/bindings/core/v8/Dictionary.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698