[webcrypto] Allow both ArrayBuffer and ArrayBufferView as inputs to crypto.subtle methods.

Source/modules/crypto/SubtleCrypto.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 27 matching lines @@
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 
 namespace WebCore {
 
 class Dictionary;
 class Key;
 
 class SubtleCrypto : public GarbageCollectedFinalized<SubtleCrypto>,  public ScriptWrappable {
 public:
+    // Adapter to implicitly convert an ArrayBuffer* or ArrayBufferView* to a
+    // common data type. This simplifies having to define a bunch of overloads
+    // for functions that take either parameter.
+    struct Bytes {
+        Bytes();
+        Bytes(ArrayBuffer*);
+        Bytes(ArrayBufferView*);
+
+        const unsigned char* bytes;
+        unsigned size;
+        bool isNull;
+
+    private:
+        void initNull();
+    };

[abarth-chromium, 2014/05/06 05:30:49]

Can you move this class in WTF?  It seems generally useful.  We might need to
give it a more decorated name though.  ArrayBytes??

[eroman, 2014/05/06 21:27:26]

Done.

+
     static SubtleCrypto* create()
     {
         return new SubtleCrypto();
     }
 
-    ScriptPromise encrypt(const Dictionary&, Key*, ArrayBufferView* data);
-    ScriptPromise decrypt(const Dictionary&, Key*, ArrayBufferView* data);
-    ScriptPromise sign(const Dictionary&, Key*, ArrayBufferView* data);
+    ScriptPromise encrypt(const Dictionary&, Key*, const Bytes&);
+    ScriptPromise decrypt(const Dictionary&, Key*, const Bytes&);
+    ScriptPromise sign(const Dictionary&, Key*, const Bytes&);
     // Note that this is not named "verify" because when compiling on Mac that expands to a macro and breaks.
-    ScriptPromise verifySignature(const Dictionary&, Key*, ArrayBufferView* signature, ArrayBufferView* data);
-    ScriptPromise digest(const Dictionary&, ArrayBufferView* data);
+    ScriptPromise verifySignature(const Dictionary&, Key*, const Bytes& signature, const Bytes& data);
+    ScriptPromise digest(const Dictionary&, const Bytes& data);
 
     ScriptPromise generateKey(const Dictionary&, bool extractable, const Vector<String>& keyUsages);
-    ScriptPromise importKey(const String&, ArrayBufferView*, const Dictionary&, bool extractable, const Vector<String>& keyUsages);
+    ScriptPromise importKey(const String&, const Bytes&, const Dictionary&, bool extractable, const Vector<String>& keyUsages);
     ScriptPromise exportKey(const String&, Key*);
 
     ScriptPromise wrapKey(const String&, Key*, Key*, const Dictionary&);
-    ScriptPromise unwrapKey(const String&, ArrayBufferView*, Key*, const Dictionary&, const Dictionary&, bool, const Vector<String>&);
+    ScriptPromise unwrapKey(const String&, const Bytes&, Key*, const Dictionary&, const Dictionary&, bool, const Vector<String>&);
 
     void trace(Visitor*) { }
 
 private:
     SubtleCrypto();
 };
 
 } // namespace WebCore
 
 #endif