[webnfc] Nfc.push method must reject promise with TypeError

third_party/WebKit/Source/modules/nfc/NFC.cpp

 // Copyright 2015 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/nfc/NFC.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/V8ArrayBuffer.h"
 #include "bindings/core/v8/V8StringResource.h"
 #include "core/dom/DOMArrayBuffer.h"
@@ skipping 413 matching lines @@
     case device::nfc::mojom::blink::NFCRecordType::OPAQUE_RECORD:
       return IsValidOpaqueRecord(record);
     case device::nfc::mojom::blink::NFCRecordType::EMPTY:
       return !record.hasData() && record.mediaType().IsEmpty();
   }
 
   NOTREACHED();
   return false;
 }
 
-DOMException* IsValidNFCRecordArray(const HeapVector<NFCRecord>& records) {
-  // https://w3c.github.io/web-nfc/#the-push-method
-  // If NFCMessage.data is empty, reject promise with SyntaxError
+bool IsValidNFCRecordArray(const HeapVector<NFCRecord>& records) {
   if (records.IsEmpty())
-    return DOMException::Create(kSyntaxError);
+    return false;
 
   for (const auto& record : records) {
     if (!IsValidNFCRecord(record))
-      return DOMException::Create(kSyntaxError);
+      return false;
   }
 
-  return nullptr;
+  return true;
 }
 
-DOMException* IsValidNFCPushMessage(const NFCPushMessage& message) {
+bool IsValidNFCPushMessage(const NFCPushMessage& message) {
+  // If NFCPushMessage of invalid type, reject promise with TypeError
   if (!message.isNFCMessage() && !message.isString() &&
       !message.isArrayBuffer())
-    return DOMException::Create(kTypeMismatchError);
+    return false;
 
   if (message.isNFCMessage()) {
+    // https://w3c.github.io/web-nfc/#the-push-method
+    // If NFCMessage.data is empty, reject promise with TypeError
     if (!message.getAsNFCMessage().hasData())
-      return DOMException::Create(kTypeMismatchError);
+      return false;
 
     return IsValidNFCRecordArray(message.getAsNFCMessage().data());
   }
 
-  return nullptr;
+  return true;
 }
 
 bool SetURL(const String& origin,
             device::nfc::mojom::blink::NFCMessagePtr& message) {
   KURL origin_url(kParsedURLString, origin);
 
   if (!message->url.IsEmpty() && origin_url.CanSetPathname()) {
     origin_url.SetPath(message->url);
   }
 
@@ skipping 136 matching lines @@
 
 // https://w3c.github.io/web-nfc/#writing-or-pushing-content
 // https://w3c.github.io/web-nfc/#dom-nfc-push
 ScriptPromise NFC::push(ScriptState* script_state,
                         const NFCPushMessage& push_message,
                         const NFCPushOptions& options) {
   ScriptPromise promise = RejectIfNotSupported(script_state);
   if (!promise.IsEmpty())
     return promise;
 
-  DOMException* exception = IsValidNFCPushMessage(push_message);
-  if (exception)
-    return ScriptPromise::RejectWithDOMException(script_state, exception);
+  if (!IsValidNFCPushMessage(push_message)) {
+    return ScriptPromise::Reject(
+        script_state, V8ThrowException::CreateTypeError(
+                          script_state->GetIsolate(),
+                          "Invalid NFCPushMessage type was provided."));
+  }
 
   device::nfc::mojom::blink::NFCMessagePtr message =
       device::nfc::mojom::blink::NFCMessage::From(push_message);
   if (!message)
     return ScriptPromise::RejectWithDOMException(
         script_state, DOMException::Create(kSyntaxError));
 
   if (!SetURL(
           ExecutionContext::From(script_state)->GetSecurityOrigin()->ToString(),
           message))
@@ skipping 195 matching lines @@
 }
 
 DEFINE_TRACE(NFC) {
   PageVisibilityObserver::Trace(visitor);
   ContextLifecycleObserver::Trace(visitor);
   visitor->Trace(requests_);
   visitor->Trace(callbacks_);
 }
 
 }  // namespace blink