[webkit-changes] [173183] trunk/Source/WebCore

[commit-queue]

Title: [173183] trunk/Source/WebCore

Revision

173183

Author

commit-qu...@webkit.org

Date

2014-09-02 13:14:31 -0700 (Tue, 02 Sep 2014)

Log Message

Use jsNontrivialString for strings we know are more than a single character
https://bugs.webkit.org/show_bug.cgi?id=136393

Patch by Joseph Pecoraro <pecor...@apple.com> on 2014-09-02
Reviewed by Geoffrey Garen.

* bindings/js/JSCryptoKeySerializationJWK.cpp:
(WebCore::addUsagesToJSON):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (173182 => 173183)

--- trunk/Source/WebCore/ChangeLog	2014-09-02 19:07:42 UTC (rev 173182)
+++ trunk/Source/WebCore/ChangeLog	2014-09-02 20:14:31 UTC (rev 173183)
@@ -1,3 +1,13 @@
+2014-09-02  Joseph Pecoraro  <pecor...@apple.com>
+
+        Use jsNontrivialString for strings we know are more than a single character
+        https://bugs.webkit.org/show_bug.cgi?id=136393
+
+        Reviewed by Geoffrey Garen.
+
+        * bindings/js/JSCryptoKeySerializationJWK.cpp:
+        (WebCore::addUsagesToJSON):
+
 2014-09-02  Alex Christensen  <achristen...@webkit.org>
 
         Fix bindings tests after r173176.

Modified: trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp (173182 => 173183)

--- trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp	2014-09-02 19:07:42 UTC (rev 173182)
+++ trunk/Source/WebCore/bindings/js/JSCryptoKeySerializationJWK.cpp	2014-09-02 20:14:31 UTC (rev 173183)
@@ -658,21 +658,21 @@
 
     unsigned index = 0;
     if (usages & CryptoKeyUsageSign)
-        keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("sign")));
+        keyOps->putDirectIndex(exec, index++, jsNontrivialString(exec, ASCIILiteral("sign")));
     if (usages & CryptoKeyUsageVerify)
-        keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("verify")));
+        keyOps->putDirectIndex(exec, index++, jsNontrivialString(exec, ASCIILiteral("verify")));
     if (usages & CryptoKeyUsageEncrypt)
-        keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("encrypt")));
+        keyOps->putDirectIndex(exec, index++, jsNontrivialString(exec, ASCIILiteral("encrypt")));
     if (usages & CryptoKeyUsageDecrypt)
-        keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("decrypt")));
+        keyOps->putDirectIndex(exec, index++, jsNontrivialString(exec, ASCIILiteral("decrypt")));
     if (usages & CryptoKeyUsageWrapKey)
-        keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("wrapKey")));
+        keyOps->putDirectIndex(exec, index++, jsNontrivialString(exec, ASCIILiteral("wrapKey")));
     if (usages & CryptoKeyUsageUnwrapKey)
-        keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("unwrapKey")));
+        keyOps->putDirectIndex(exec, index++, jsNontrivialString(exec, ASCIILiteral("unwrapKey")));
     if (usages & CryptoKeyUsageDeriveKey)
-        keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("deriveKey")));
+        keyOps->putDirectIndex(exec, index++, jsNontrivialString(exec, ASCIILiteral("deriveKey")));
     if (usages & CryptoKeyUsageDeriveBits)
-        keyOps->putDirectIndex(exec, index++, jsString(exec, ASCIILiteral("deriveBits")));
+        keyOps->putDirectIndex(exec, index++, jsNontrivialString(exec, ASCIILiteral("deriveBits")));
 
     json->putDirect(exec->vm(), Identifier(exec, "key_ops"), keyOps);
 }

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes