| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/nfc/NFC.h" | 5 #include "modules/nfc/NFC.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ScriptPromiseResolver.h" | 7 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 8 #include "bindings/core/v8/V8ArrayBuffer.h" | 8 #include "bindings/core/v8/V8ArrayBuffer.h" |
| 9 #include "bindings/core/v8/V8StringResource.h" | 9 #include "bindings/core/v8/V8StringResource.h" |
| 10 #include "core/dom/DOMArrayBuffer.h" | 10 #include "core/dom/DOMArrayBuffer.h" |
| (...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 m_nfc->ResumeNFCOperations(); | 731 m_nfc->ResumeNFCOperations(); |
| 732 else | 732 else |
| 733 m_nfc->SuspendNFCOperations(); | 733 m_nfc->SuspendNFCOperations(); |
| 734 } | 734 } |
| 735 | 735 |
| 736 void NFC::OnRequestCompleted(ScriptPromiseResolver* resolver, | 736 void NFC::OnRequestCompleted(ScriptPromiseResolver* resolver, |
| 737 device::nfc::mojom::blink::NFCErrorPtr error) { | 737 device::nfc::mojom::blink::NFCErrorPtr error) { |
| 738 if (!m_requests.contains(resolver)) | 738 if (!m_requests.contains(resolver)) |
| 739 return; | 739 return; |
| 740 | 740 |
| 741 m_requests.remove(resolver); | 741 m_requests.erase(resolver); |
| 742 if (error.is_null()) | 742 if (error.is_null()) |
| 743 resolver->resolve(); | 743 resolver->resolve(); |
| 744 else | 744 else |
| 745 resolver->reject(NFCError::take(resolver, error->error_type)); | 745 resolver->reject(NFCError::take(resolver, error->error_type)); |
| 746 } | 746 } |
| 747 | 747 |
| 748 void NFC::OnConnectionError() { | 748 void NFC::OnConnectionError() { |
| 749 m_nfc.reset(); | 749 m_nfc.reset(); |
| 750 m_callbacks.clear(); | 750 m_callbacks.clear(); |
| 751 | 751 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 796 scriptState, DOMException::create(NotSupportedError)); | 796 scriptState, DOMException::create(NotSupportedError)); |
| 797 } | 797 } |
| 798 | 798 |
| 799 return ScriptPromise(); | 799 return ScriptPromise(); |
| 800 } | 800 } |
| 801 | 801 |
| 802 void NFC::OnWatchRegistered(MessageCallback* callback, | 802 void NFC::OnWatchRegistered(MessageCallback* callback, |
| 803 ScriptPromiseResolver* resolver, | 803 ScriptPromiseResolver* resolver, |
| 804 uint32_t id, | 804 uint32_t id, |
| 805 device::nfc::mojom::blink::NFCErrorPtr error) { | 805 device::nfc::mojom::blink::NFCErrorPtr error) { |
| 806 m_requests.remove(resolver); | 806 m_requests.erase(resolver); |
| 807 | 807 |
| 808 // Invalid id was returned. | 808 // Invalid id was returned. |
| 809 // https://w3c.github.io/web-nfc/#dom-nfc-watch | 809 // https://w3c.github.io/web-nfc/#dom-nfc-watch |
| 810 // 8. If the request fails, reject promise with "NotSupportedError" | 810 // 8. If the request fails, reject promise with "NotSupportedError" |
| 811 // and abort these steps. | 811 // and abort these steps. |
| 812 if (!id) { | 812 if (!id) { |
| 813 resolver->reject(NFCError::take( | 813 resolver->reject(NFCError::take( |
| 814 resolver, device::nfc::mojom::blink::NFCErrorType::NOT_SUPPORTED)); | 814 resolver, device::nfc::mojom::blink::NFCErrorType::NOT_SUPPORTED)); |
| 815 return; | 815 return; |
| 816 } | 816 } |
| 817 | 817 |
| 818 if (error.is_null()) { | 818 if (error.is_null()) { |
| 819 m_callbacks.insert(id, callback); | 819 m_callbacks.insert(id, callback); |
| 820 resolver->resolve(id); | 820 resolver->resolve(id); |
| 821 } else { | 821 } else { |
| 822 resolver->reject(NFCError::take(resolver, error->error_type)); | 822 resolver->reject(NFCError::take(resolver, error->error_type)); |
| 823 } | 823 } |
| 824 } | 824 } |
| 825 | 825 |
| 826 DEFINE_TRACE(NFC) { | 826 DEFINE_TRACE(NFC) { |
| 827 PageVisibilityObserver::trace(visitor); | 827 PageVisibilityObserver::trace(visitor); |
| 828 ContextLifecycleObserver::trace(visitor); | 828 ContextLifecycleObserver::trace(visitor); |
| 829 visitor->trace(m_requests); | 829 visitor->trace(m_requests); |
| 830 visitor->trace(m_callbacks); | 830 visitor->trace(m_callbacks); |
| 831 } | 831 } |
| 832 | 832 |
| 833 } // namespace blink | 833 } // namespace blink |
| OLD | NEW |