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

third_party/WebKit/Source/modules/fetch/Request.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/Request.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/loader/ThreadableLoader.h"
@@ skipping 287 matching lines @@
   // Headers object whose guard is "request"."
   Request* r = Request::create(scriptState, request);
   // Perform the following steps:
   // - "Let |headers| be a copy of |r|'s Headers object."
   // - "If |init|'s headers member is present, set |headers| to |init|'s
   //   headers member."
   //
   // We don't create a copy of r's Headers object when init's headers member
   // is present.
   Headers* headers = nullptr;
-  if (!init.headers && init.headersDictionary.isUndefinedOrNull()) {
+  if (!init.headers) {
     headers = r->getHeaders()->clone();
   }
   // "Empty |r|'s request's header list."
   r->m_request->headerList()->clearList();
   // "If |r|'s request's mode is "no-cors", run these substeps:
   if (r->getRequest()->mode() == WebURLRequest::FetchRequestModeNoCORS) {
     // "If |r|'s request's method is not a simple method, throw a
     // TypeError."
     if (!FetchUtils::isSimpleMethod(r->getRequest()->method())) {
       exceptionState.throwTypeError("'" + r->getRequest()->method() +
                                     "' is unsupported in no-cors mode.");
       return nullptr;
     }
     // "If |request|'s integrity metadata is not the empty string, throw a
     // TypeError."
     if (!request->integrity().isEmpty()) {
       exceptionState.throwTypeError(
           "The integrity attribute is unsupported in no-cors mode.");
       return nullptr;
     }
     // "Set |r|'s Headers object's guard to "request-no-cors"."
     r->getHeaders()->setGuard(Headers::RequestNoCORSGuard);
   }
   // "Fill |r|'s Headers object with |headers|. Rethrow any exceptions."
   if (init.headers) {
-    ASSERT(init.headersDictionary.isUndefinedOrNull());
     r->getHeaders()->fillWith(init.headers.get(), exceptionState);
-  } else if (!init.headersDictionary.isUndefinedOrNull()) {
-    r->getHeaders()->fillWith(init.headersDictionary, exceptionState);
   } else {
     ASSERT(headers);
     r->getHeaders()->fillWith(headers, exceptionState);
   }
   if (exceptionState.hadException())
     return nullptr;
 
   // "If either |init|'s body member is present or |temporaryBody| is
   // non-null, and |request|'s method is `GET` or `HEAD`, throw a TypeError.
   if (init.body || temporaryBody ||
@@ skipping 385 matching lines @@
       V8HiddenValue::internalBodyBuffer(scriptState->isolate()), bodyBuffer);
 }
 
 DEFINE_TRACE(Request) {
   Body::trace(visitor);
   visitor->trace(m_request);
   visitor->trace(m_headers);
 }
 
 }  // namespace blink