Fetch: Make Headers' constructor match the current spec IDL.

third_party/WebKit/Source/modules/fetch/RequestInit.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/fetch/RequestInit.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/V8ArrayBuffer.h"
 #include "bindings/core/v8/V8ArrayBufferView.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8Blob.h"
 #include "bindings/core/v8/V8FormData.h"
 #include "bindings/core/v8/V8URLSearchParams.h"
+#include "bindings/modules/v8/ByteStringSequenceSequenceOrDictionaryOrHeaders.h"
 #include "bindings/modules/v8/V8PasswordCredential.h"
 #include "core/dom/URLSearchParams.h"
 #include "core/fileapi/Blob.h"
 #include "core/html/FormData.h"
 #include "modules/fetch/BlobBytesConsumer.h"
 #include "modules/fetch/FormDataBytesConsumer.h"
 #include "modules/fetch/Headers.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/blob/BlobData.h"
 #include "platform/network/EncodedFormData.h"
 #include "platform/weborigin/ReferrerPolicy.h"
 
 namespace blink {
 
 RequestInit::RequestInit(ExecutionContext* context,
                          const Dictionary& options,
                          ExceptionState& exceptionState)
     : areAnyMembersSet(false) {
   areAnyMembersSet |= DictionaryHelper::get(options, "method", method);
-  areAnyMembersSet |= DictionaryHelper::get(options, "headers", headers);
-  if (!headers) {
-    Vector<Vector<String>> headersVector;
-    if (DictionaryHelper::get(options, "headers", headersVector,
-                              exceptionState)) {
-      headers = Headers::create(headersVector, exceptionState);
-      areAnyMembersSet = true;
-    } else {
-      areAnyMembersSet |=
-          DictionaryHelper::get(options, "headers", headersDictionary);
-    }
-  }
+
+  v8::Local<v8::Value> v8Headers;
+  bool isHeadersSet = DictionaryHelper::get(options, "headers", v8Headers);
+  areAnyMembersSet |= isHeadersSet;
+
   areAnyMembersSet |= DictionaryHelper::get(options, "mode", mode);
   areAnyMembersSet |= DictionaryHelper::get(options, "redirect", redirect);
   AtomicString referrerString;
   bool isReferrerStringSet =
       DictionaryHelper::get(options, "referrer", referrerString);
   areAnyMembersSet |= isReferrerStringSet;
   areAnyMembersSet |= DictionaryHelper::get(options, "integrity", integrity);
   AtomicString referrerPolicyString;
   bool isReferrerPolicySet =
       DictionaryHelper::get(options, "referrerPolicy", referrerPolicyString);
@@ skipping 37 matching lines @@
         referrer.referrerPolicy =
             ReferrerPolicyNoReferrerWhenDowngradeOriginWhenCrossOrigin;
       } else {
         exceptionState.throwTypeError("Invalid referrer policy");
         return;
       }
     }
   }
 
   v8::Isolate* isolate = toIsolate(context);
+
+  if (isHeadersSet) {
+    ByteStringSequenceSequenceOrDictionaryOrHeaders headersInit;
+    V8ByteStringSequenceSequenceOrDictionaryOrHeaders::toImpl(
+        isolate, v8Headers, headersInit, UnionTypeConversionMode::NotNullable,
+        exceptionState);
+    headers = Headers::create(headersInit, exceptionState);
+  }
+
   if (isCredentialSet) {
     if (V8PasswordCredential::hasInstance(v8Credential, isolate)) {
       // TODO(mkwst): According to the spec, we'd serialize this once we touch
       // the network. We're serializing it here, ahead of time, because lifetime
       // issues around ResourceRequest make it pretty difficult to pass a
       // PasswordCredential around at the platform level, and the hop between
       // the browser and renderer processes to deal with service workers is
       // equally painful. There should be no developer-visible difference in
       // behavior with this option, except that the `Content-Type` header will
       // be set early. That seems reasonable.
@@ skipping 36 matching lines @@
         AtomicString("application/x-www-form-urlencoded;charset=UTF-8");
     body = new FormDataBytesConsumer(context, formData.release());
   } else if (v8Body->IsString()) {
     contentType = "text/plain;charset=UTF-8";
     body =
         new FormDataBytesConsumer(toUSVString(isolate, v8Body, exceptionState));
   }
 }
 
 }  // namespace blink