| 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 <string.h> | 36 #include <string.h> |
| 37 | 37 |
| 38 namespace blink { | 38 namespace blink { |
| 39 | 39 |
| 40 void WebCryptoResult::completeWithError() | 40 void WebCryptoResult::completeWithError() |
| 41 { | 41 { |
| 42 m_impl->completeWithError(); | 42 m_impl->completeWithError(); |
| 43 reset(); | 43 reset(); |
| 44 } | 44 } |
| 45 | 45 |
| 46 void WebCryptoResult::completeWithError(const WebString& errorDetails) |
| 47 { |
| 48 // FIXME: The error details are being temporarily discarded. Once the |
| 49 // Chromium side has been updated to emit error details, this should be |
| 50 // enabled and the layouttests rebaselined. |
| 51 m_impl->completeWithError(/*errorDetails*/); |
| 52 reset(); |
| 53 } |
| 54 |
| 46 void WebCryptoResult::completeWithBuffer(const WebArrayBuffer& buffer) | 55 void WebCryptoResult::completeWithBuffer(const WebArrayBuffer& buffer) |
| 47 { | 56 { |
| 48 RELEASE_ASSERT(!buffer.isNull()); | 57 RELEASE_ASSERT(!buffer.isNull()); |
| 49 m_impl->completeWithBuffer(buffer); | 58 m_impl->completeWithBuffer(buffer); |
| 50 reset(); | 59 reset(); |
| 51 } | 60 } |
| 52 | 61 |
| 53 void WebCryptoResult::completeWithBuffer(const void* bytes, unsigned bytesSize) | 62 void WebCryptoResult::completeWithBuffer(const void* bytes, unsigned bytesSize) |
| 54 { | 63 { |
| 55 WebArrayBuffer buffer = blink::WebArrayBuffer::create(bytesSize, 1); | 64 WebArrayBuffer buffer = blink::WebArrayBuffer::create(bytesSize, 1); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 { | 98 { |
| 90 m_impl.reset(); | 99 m_impl.reset(); |
| 91 } | 100 } |
| 92 | 101 |
| 93 void WebCryptoResult::assign(const WebCryptoResult& o) | 102 void WebCryptoResult::assign(const WebCryptoResult& o) |
| 94 { | 103 { |
| 95 m_impl = o.m_impl; | 104 m_impl = o.m_impl; |
| 96 } | 105 } |
| 97 | 106 |
| 98 } // namespace blink | 107 } // namespace blink |
| OLD | NEW |