Revert 266798 "[webcrypto] Make operations run on a background t..."

trunk/src/content/child/webcrypto/webcrypto_util.cc

 // 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 "content/child/webcrypto/webcrypto_util.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "content/child/webcrypto/status.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithm.h"
 #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
 
 namespace content {
 
 namespace webcrypto {
 
 const uint8* Uint8VectorStart(const std::vector<uint8>& data) {
   if (data.empty())
     return NULL;
   return &data[0];
 }
 
-uint8* Uint8VectorStart(std::vector<uint8>* data) {
-  if (data->empty())
-    return NULL;
-  return &(*data)[0];
+void ShrinkBuffer(blink::WebArrayBuffer* buffer, unsigned int new_size) {
+  DCHECK_LE(new_size, buffer->byteLength());
+
+  if (new_size == buffer->byteLength())
+    return;
+
+  blink::WebArrayBuffer new_buffer = blink::WebArrayBuffer::create(new_size, 1);
+  DCHECK(!new_buffer.isNull());
+  memcpy(new_buffer.data(), buffer->data(), new_size);
+  *buffer = new_buffer;
+}
+
+blink::WebArrayBuffer CreateArrayBuffer(const uint8* data,
+                                        unsigned int data_size) {
+  blink::WebArrayBuffer buffer = blink::WebArrayBuffer::create(data_size, 1);
+  DCHECK(!buffer.isNull());
+  if (data_size)  // data_size == 0 might mean the data pointer is invalid
+    memcpy(buffer.data(), data, data_size);
+  return buffer;
 }
 
 // This function decodes unpadded 'base64url' encoded data, as described in
 // RFC4648 (http://www.ietf.org/rfc/rfc4648.txt) Section 5. To do this, first
 // change the incoming data to 'base64' encoding by applying the appropriate
 // transformation including adding padding if required, and then call a base64
 // decoder.
 bool Base64DecodeUrlSafe(const std::string& input, std::string* output) {
   std::string base64EncodedText(input);
   std::replace(base64EncodedText.begin(), base64EncodedText.end(), '-', '+');
@@ skipping 143 matching lines @@
           algorithm.id(), keylen_bytes * 8);
       return true;
     default:
       return false;
   }
 }
 
 }  // namespace webcrypto
 
 }  // namespace content