Modified: trunk/Tools/ChangeLog (197119 => 197120)
--- trunk/Tools/ChangeLog 2016-02-25 16:34:59 UTC (rev 197119)
+++ trunk/Tools/ChangeLog 2016-02-25 16:35:00 UTC (rev 197120)
@@ -1,5 +1,13 @@
2016-02-25 Eric Carlson <eric.carl...@apple.com>
+ Unreviewed, fix iOS builds after r197114.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::createCanonicalUUIDString):
+ (WTR::TestController::saltForOrigin):
+
+2016-02-25 Eric Carlson <eric.carl...@apple.com>
+
[MediaStream] MediaDeviceInfo deviceId and groupId must be unique to the page's origin
https://bugs.webkit.org/show_bug.cgi?id=153163
<rdar://problem/24334526>
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (197119 => 197120)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-02-25 16:34:59 UTC (rev 197119)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-02-25 16:35:00 UTC (rev 197120)
@@ -1728,6 +1728,28 @@
decidePolicyForUserMediaPermissionRequestIfPossible();
}
+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:
explicit OriginSettings()
@@ -1767,13 +1789,13 @@
return frameSalt;
if (!settings->persistentSalt().length())
- settings->setPersistentSalt(WebCore::createCanonicalUUIDString());
+ settings->setPersistentSalt(createCanonicalUUIDString());
return settings->persistentSalt();
}
if (!frameSalt.length()) {
- frameSalt = WebCore::createCanonicalUUIDString();
+ frameSalt = createCanonicalUUIDString();
ephemeralSalts.add(frameIdentifier, frameSalt);
}
