Changeset 197120 in webkit

Timestamp:

Feb 25, 2016 8:35:00 AM (8 years ago)

Author:

eric.carlson@apple.com

Message:

Unreviewed, fix iOS builds after r197114.

• WebKitTestRunner/TestController.cpp:

(WTR::createCanonicalUUIDString):
(WTR::TestController::saltForOrigin):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/TestController.cpp (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-02-25  Eric Carlson  <eric.carlson@apple.com>
+
+        Unreviewed, fix iOS builds after r197114.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::createCanonicalUUIDString):
+        (WTR::TestController::saltForOrigin):
+
 2016-02-25  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -1729 +1729 @@
 }
 
+static String createCanonicalUUIDString()
+{
+    unsigned randomData[4];
+    cryptographicallyRandomValues(reinterpret_cast<unsigned char*>(randomData), sizeof(randomData));
+
+    // Format as Version 4 UUID.
+    StringBuilder builder;
+    builder.reserveCapacity(36);
+    appendUnsignedAsHexFixedSize(randomData[0], builder, 8, Lowercase);
+    builder.append('-');
+    appendUnsignedAsHexFixedSize(randomData[1] >> 16, builder, 4, Lowercase);
+    builder.appendLiteral("-4");
+    appendUnsignedAsHexFixedSize(randomData[1] & 0x00000fff, builder, 3, Lowercase);
+    builder.append('-');
+    appendUnsignedAsHexFixedSize((randomData[2] >> 30) | 0x8, builder, 1, Lowercase);
+    appendUnsignedAsHexFixedSize((randomData[2] >> 16) & 0x00000fff, builder, 3, Lowercase);
+    builder.append('-');
+    appendUnsignedAsHexFixedSize(randomData[2] & 0x0000ffff, builder, 4, Lowercase);
+    appendUnsignedAsHexFixedSize(randomData[3], builder, 8, Lowercase);
+    return builder.toString();
+}
+
 class OriginSettings : public RefCounted<OriginSettings> {
 public:
@@ -1768 +1790 @@
 
         if (!settings->persistentSalt().length())
-            settings->setPersistentSalt(WebCore::createCanonicalUUIDString());
+            settings->setPersistentSalt(createCanonicalUUIDString());
 
         return settings->persistentSalt();
@@ -1774 +1796 @@
 
     if (!frameSalt.length()) {
-        frameSalt = WebCore::createCanonicalUUIDString();
+        frameSalt = createCanonicalUUIDString();
         ephemeralSalts.add(frameIdentifier, frameSalt);
     }