| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 #include "bindings/core/v8/V8ArrayBuffer.h" | 36 #include "bindings/core/v8/V8ArrayBuffer.h" |
| 37 #include "bindings/core/v8/V8Binding.h" | 37 #include "bindings/core/v8/V8Binding.h" |
| 38 #include "bindings/core/v8/V8ObjectBuilder.h" | 38 #include "bindings/core/v8/V8ObjectBuilder.h" |
| 39 #include "bindings/modules/v8/V8CryptoKey.h" | 39 #include "bindings/modules/v8/V8CryptoKey.h" |
| 40 #include "core/dom/ContextLifecycleObserver.h" | 40 #include "core/dom/ContextLifecycleObserver.h" |
| 41 #include "core/dom/DOMArrayBuffer.h" | 41 #include "core/dom/DOMArrayBuffer.h" |
| 42 #include "core/dom/DOMException.h" | 42 #include "core/dom/DOMException.h" |
| 43 #include "core/dom/ExecutionContext.h" | 43 #include "core/dom/ExecutionContext.h" |
| 44 #include "modules/crypto/CryptoKey.h" | 44 #include "modules/crypto/CryptoKey.h" |
| 45 #include "modules/crypto/NormalizeAlgorithm.h" | 45 #include "modules/crypto/NormalizeAlgorithm.h" |
| 46 #include "platform/wtf/Atomics.h" |
| 46 #include "public/platform/Platform.h" | 47 #include "public/platform/Platform.h" |
| 47 #include "public/platform/WebCryptoAlgorithm.h" | 48 #include "public/platform/WebCryptoAlgorithm.h" |
| 48 #include "wtf/Atomics.h" | |
| 49 | 49 |
| 50 namespace blink { | 50 namespace blink { |
| 51 | 51 |
| 52 static void RejectWithTypeError(const String& error_details, | 52 static void RejectWithTypeError(const String& error_details, |
| 53 ScriptPromiseResolver* resolver) { | 53 ScriptPromiseResolver* resolver) { |
| 54 // Duplicate some of the checks done by ScriptPromiseResolver. | 54 // Duplicate some of the checks done by ScriptPromiseResolver. |
| 55 if (!resolver->GetExecutionContext() || | 55 if (!resolver->GetExecutionContext() || |
| 56 resolver->GetExecutionContext()->IsContextDestroyed()) | 56 resolver->GetExecutionContext()->IsContextDestroyed()) |
| 57 return; | 57 return; |
| 58 | 58 |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 cancel_->Cancel(); | 230 cancel_->Cancel(); |
| 231 cancel_.Clear(); | 231 cancel_.Clear(); |
| 232 ClearResolver(); | 232 ClearResolver(); |
| 233 } | 233 } |
| 234 | 234 |
| 235 ScriptPromise CryptoResultImpl::Promise() { | 235 ScriptPromise CryptoResultImpl::Promise() { |
| 236 return resolver_ ? resolver_->Promise() : ScriptPromise(); | 236 return resolver_ ? resolver_->Promise() : ScriptPromise(); |
| 237 } | 237 } |
| 238 | 238 |
| 239 } // namespace blink | 239 } // namespace blink |
| OLD | NEW |