[webkit-changes] [294916] trunk

Thu, 26 May 2022 17:50:13 -0700

Title: [294916] trunk
Revision
294916
Author
[email protected]
Date
2022-05-26 17:50:02 -0700 (Thu, 26 May 2022)

Log Message

Make StringView(const char*) private
https://bugs.webkit.org/show_bug.cgi?id=240942

Reviewed by Darin Adler.

Make StringView(const char*) private and update existing call sites
to use either StringView(ASCIILiteral) or StringView::fromLatin1(const char*).

* Source/WTF/wtf/text/StringView.h:
* Source/WebCore/platform/sql/SQLiteStatement.cpp:
(WebCore::SQLiteStatement::isColumnDeclaredAsBlob):
* Source/WebGPU/WGSL/Parser.cpp:
(WGSL::Parser<Lexer>::parseTypeDecl):
* Tools/TestWebKitAPI/Tests/WTF/StringParsingBuffer.cpp:
(TestWebKitAPI::TEST):
* Tools/TestWebKitAPI/Tests/WTF/StringView.cpp:
(TestWebKitAPI::stringViewFromLiteral):
* Tools/TestWebKitAPI/Tests/WTF/TextBreakIterator.cpp:
(TestWebKitAPI::TEST):
* Tools/TestWebKitAPI/Tests/WebCore/ISOBox.cpp:
(TestWebKitAPI::TEST):

Canonical link: https://commits.webkit.org/251034@main

Modified Paths

Diff

Modified: trunk/Source/WTF/wtf/Threading.cpp (294915 => 294916)


--- trunk/Source/WTF/wtf/Threading.cpp	2022-05-27 00:23:14 UTC (rev 294915)
+++ trunk/Source/WTF/wtf/Threading.cpp	2022-05-27 00:50:02 UTC (rev 294916)
@@ -166,7 +166,7 @@
     // This name can be com.apple.WebKit.ProcessLauncher or com.apple.CoreIPC.ReceiveQueue.
     // We are using those names for the thread name, but both are longer than the limit of
     // the platform thread name length, 32 for Windows and 16 for Linux.
-    StringView result(threadName);
+    auto result = StringView::fromLatin1(threadName);
     size_t size = result.reverseFind('.');
     if (size != notFound)
         result = result.substring(size + 1);

Modified: trunk/Source/WTF/wtf/linux/MemoryFootprintLinux.cpp (294915 => 294916)


--- trunk/Source/WTF/wtf/linux/MemoryFootprintLinux.cpp	2022-05-27 00:23:14 UTC (rev 294915)
+++ trunk/Source/WTF/wtf/linux/MemoryFootprintLinux.cpp	2022-05-27 00:50:02 UTC (rev 294916)
@@ -69,7 +69,7 @@
                 return;
             }
             if (scannedCount == 7) {
-                StringView pathString(path);
+                auto pathString = StringView::fromLatin1(path);
                 isAnonymous = pathString == "[heap]"_s || pathString.startsWith("[stack"_s);
                 return;
             }

Modified: trunk/Source/WTF/wtf/text/StringView.h (294915 => 294916)


--- trunk/Source/WTF/wtf/text/StringView.h	2022-05-27 00:23:14 UTC (rev 294915)
+++ trunk/Source/WTF/wtf/text/StringView.h	2022-05-27 00:50:02 UTC (rev 294916)
@@ -69,9 +69,6 @@
     StringView(const char*, unsigned length);
     StringView(ASCIILiteral);
 
-    // FIXME: Make private once all call sites have been ported to fromLatin1.
-    explicit StringView(const char*);
-
     ALWAYS_INLINE static StringView fromLatin1(const char* characters) { return StringView { characters }; }
 
     static StringView empty();
@@ -191,6 +188,9 @@
     struct UnderlyingString;
 
 private:
+    // Clients should use StringView(ASCIILiteral) or StringView::fromLatin1() instead.
+    explicit StringView(const char*);
+
     friend bool equal(StringView, StringView);
     friend WTF_EXPORT_PRIVATE bool equalRespectingNullity(StringView, StringView);

Modified: trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp (294915 => 294916)


--- trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp	2022-05-27 00:23:14 UTC (rev 294915)
+++ trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp	2022-05-27 00:50:02 UTC (rev 294916)
@@ -271,7 +271,7 @@
 
     {
         const char* extensionsString = eglQueryString(m_eglDisplay, EGL_EXTENSIONS);
-        auto displayExtensions = StringView { extensionsString }.split(' ');
+        auto displayExtensions = StringView::fromLatin1(extensionsString).split(' ');
         auto findExtension =
             [&](auto extensionName) {
                 return std::any_of(displayExtensions.begin(), displayExtensions.end(),

Modified: trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp (294915 => 294916)


--- trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp	2022-05-27 00:23:14 UTC (rev 294915)
+++ trunk/Source/WebCore/platform/sql/SQLiteStatement.cpp	2022-05-27 00:50:02 UTC (rev 294916)
@@ -183,7 +183,7 @@
 bool SQLiteStatement::isColumnDeclaredAsBlob(int col)
 {
     ASSERT(col >= 0);
-    return equalLettersIgnoringASCIICase(StringView(sqlite3_column_decltype(m_statement, col)), "blob"_s);
+    return equalLettersIgnoringASCIICase(StringView::fromLatin1(sqlite3_column_decltype(m_statement, col)), "blob"_s);
 }
 
 String SQLiteStatement::columnName(int col)

Modified: trunk/Source/WebGPU/WGSL/Parser.cpp (294915 => 294916)


--- trunk/Source/WebGPU/WGSL/Parser.cpp	2022-05-27 00:23:14 UTC (rev 294915)
+++ trunk/Source/WebGPU/WGSL/Parser.cpp	2022-05-27 00:50:02 UTC (rev 294916)
@@ -341,19 +341,19 @@
 
     if (current().m_type == TokenType::KeywordI32) {
         consume();
-        RETURN_NODE_REF(NamedType, StringView { "i32" });
+        RETURN_NODE_REF(NamedType, StringView { "i32"_s });
     }
     if (current().m_type == TokenType::KeywordF32) {
         consume();
-        RETURN_NODE_REF(NamedType, StringView { "f32" });
+        RETURN_NODE_REF(NamedType, StringView { "f32"_s });
     }
     if (current().m_type == TokenType::KeywordU32) {
         consume();
-        RETURN_NODE_REF(NamedType, StringView { "u32" });
+        RETURN_NODE_REF(NamedType, StringView { "u32"_s });
     }
     if (current().m_type == TokenType::KeywordBool) {
         consume();
-        RETURN_NODE_REF(NamedType, StringView { "bool" });
+        RETURN_NODE_REF(NamedType, StringView { "bool"_s });
     }
     if (current().m_type == TokenType::Identifier) {
         CONSUME_TYPE_NAMED(name, Identifier);

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringParsingBuffer.cpp (294915 => 294916)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringParsingBuffer.cpp	2022-05-27 00:23:14 UTC (rev 294915)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringParsingBuffer.cpp	2022-05-27 00:50:02 UTC (rev 294916)
@@ -46,7 +46,7 @@
 
 TEST(WTF, StringParsingBufferInitial)
 {
-    StringView string { "abc" };
+    StringView string { "abc"_s };
     StringParsingBuffer<LChar> parsingBuffer { string.characters8(), string.length() };
 
     EXPECT_FALSE(parsingBuffer.atEnd());
@@ -59,7 +59,7 @@
 
 TEST(WTF, StringParsingBufferAdvance)
 {
-    StringView string { "abc" };
+    StringView string { "abc"_s };
     StringParsingBuffer<LChar> parsingBuffer { string.characters8(), string.length() };
 
     parsingBuffer.advance();
@@ -71,7 +71,7 @@
 
 TEST(WTF, StringParsingBufferAdvanceBy)
 {
-    StringView string { "abc" };
+    StringView string { "abc"_s };
     StringParsingBuffer<LChar> parsingBuffer { string.characters8(), string.length() };
 
     parsingBuffer.advanceBy(2);
@@ -83,7 +83,7 @@
 
 TEST(WTF, StringParsingBufferPreIncrement)
 {
-    StringView string { "abc" };
+    StringView string { "abc"_s };
     StringParsingBuffer<LChar> parsingBuffer { string.characters8(), string.length() };
 
     auto preIncrementedParsingBuffer = ++parsingBuffer;
@@ -99,7 +99,7 @@
 
 TEST(WTF, StringParsingBufferPostIncrement)
 {
-    StringView string { "abc" };
+    StringView string { "abc"_s };
     StringParsingBuffer<LChar> parsingBuffer { string.characters8(), string.length() };
 
     auto postIncrementedParsingBuffer = parsingBuffer++;
@@ -115,7 +115,7 @@
 
 TEST(WTF, StringParsingBufferPlusEquals)
 {
-    StringView string { "abc" };
+    StringView string { "abc"_s };
     StringParsingBuffer<LChar> parsingBuffer { string.characters8(), string.length() };
 
     parsingBuffer += 2;
@@ -127,7 +127,7 @@
 
 TEST(WTF, StringParsingBufferEnd)
 {
-    StringView string { "abc" };
+    StringView string { "abc"_s };
     StringParsingBuffer<LChar> parsingBuffer { string.characters8(), string.length() };
 
     ++parsingBuffer;
@@ -147,7 +147,7 @@
 
 TEST(WTF, StringParsingBufferSubscript)
 {
-    StringView string { "abc" };
+    StringView string { "abc"_s };
     StringParsingBuffer<LChar> parsingBuffer { string.characters8(), string.length() };
     
     ++parsingBuffer;
@@ -157,7 +157,7 @@
 
 TEST(WTF, StringParsingBufferStringView)
 {
-    StringView string { "abc" };
+    StringView string { "abc"_s };
     StringParsingBuffer<LChar> parsingBuffer { string.characters8(), string.length() };
 
     ++parsingBuffer;
@@ -169,7 +169,7 @@
 
 TEST(WTF, StringParsingBufferReadCharactersForParsing)
 {
-    auto latin1 = StringView { "abc" };
+    auto latin1 = StringView { "abc"_s };
     auto result1 = WTF::readCharactersForParsing(latin1, [](auto parsingBuffer) {
         EXPECT_FALSE(parsingBuffer.atEnd());
         EXPECT_TRUE(parsingBuffer.hasCharactersRemaining());

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringView.cpp (294915 => 294916)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringView.cpp	2022-05-27 00:23:14 UTC (rev 294915)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringView.cpp	2022-05-27 00:50:02 UTC (rev 294916)
@@ -32,7 +32,7 @@
 
 StringView stringViewFromLiteral(const char* characters)
 {
-    return StringView(characters);
+    return StringView::fromLatin1(characters);
 }
 
 StringView stringViewFromUTF8(String& ref, const char* characters)

Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/TextBreakIterator.cpp (294915 => 294916)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/TextBreakIterator.cpp	2022-05-27 00:23:14 UTC (rev 294915)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/TextBreakIterator.cpp	2022-05-27 00:50:02 UTC (rev 294916)
@@ -37,22 +37,22 @@
 TEST(WTF, TextBreakIteratorNumGraphemeClusters)
 {
     EXPECT_EQ(0U, numGraphemeClusters(StringView { }));
-    EXPECT_EQ(0U, numGraphemeClusters(StringView { "" }));
+    EXPECT_EQ(0U, numGraphemeClusters(StringView { ""_s }));
     EXPECT_EQ(0U, numGraphemeClusters(makeUTF16({ })));
 
-    EXPECT_EQ(1U, numGraphemeClusters(StringView { "a" }));
+    EXPECT_EQ(1U, numGraphemeClusters(StringView { "a"_s }));
     EXPECT_EQ(1U, numGraphemeClusters(makeUTF16({ 'a' })));
-    EXPECT_EQ(1U, numGraphemeClusters(StringView { "\r\n" }));
-    EXPECT_EQ(1U, numGraphemeClusters(StringView { "\n" }));
-    EXPECT_EQ(1U, numGraphemeClusters(StringView { "\r" }));
+    EXPECT_EQ(1U, numGraphemeClusters(StringView { "\r\n"_s }));
+    EXPECT_EQ(1U, numGraphemeClusters(StringView { "\n"_s }));
+    EXPECT_EQ(1U, numGraphemeClusters(StringView { "\r"_s }));
     EXPECT_EQ(1U, numGraphemeClusters(makeUTF16({ '\r', '\n' })));
     EXPECT_EQ(1U, numGraphemeClusters(makeUTF16({ '\n' })));
     EXPECT_EQ(1U, numGraphemeClusters(makeUTF16({ '\r' })));
 
-    EXPECT_EQ(2U, numGraphemeClusters(StringView { "\n\r" }));
+    EXPECT_EQ(2U, numGraphemeClusters(StringView { "\n\r"_s }));
     EXPECT_EQ(2U, numGraphemeClusters(makeUTF16({ '\n', '\r' })));
 
-    EXPECT_EQ(2U, numGraphemeClusters(StringView { "\r\n\r" }));
+    EXPECT_EQ(2U, numGraphemeClusters(StringView { "\r\n\r"_s }));
     EXPECT_EQ(2U, numGraphemeClusters(makeUTF16({ '\r', '\n', '\r' })));
 
     EXPECT_EQ(1U, numGraphemeClusters(makeUTF16({ 'g', 0x308 })));
@@ -61,7 +61,7 @@
 
     EXPECT_EQ(2U, numGraphemeClusters(makeUTF16({ 0x308, 'g' })));
 
-    EXPECT_EQ(3U, numGraphemeClusters(StringView { "\r\nbc" }));
+    EXPECT_EQ(3U, numGraphemeClusters(StringView { "\r\nbc"_s }));
     EXPECT_EQ(3U, numGraphemeClusters(makeUTF16({ 'g', 0x308, 'b', 'c' })));
 }
 
@@ -70,24 +70,24 @@
     EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { }, 0));
     EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { }, 1));
 
-    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { "" }, 0));
-    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { "" }, 1));
+    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { ""_s }, 0));
+    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { ""_s }, 1));
 
     EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(makeUTF16({ }), 0));
     EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(makeUTF16({ }), 1));
 
-    EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(StringView { "a" }, 1));
+    EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(StringView { "a"_s }, 1));
     EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(makeUTF16({ 'a' }), 1));
-    EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(StringView { "\n" }, 1));
-    EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(StringView { "\r" }, 1));
+    EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(StringView { "\n"_s }, 1));
+    EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(StringView { "\r"_s }, 1));
     EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(makeUTF16({ '\n' }), 1));
     EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(makeUTF16({ '\r' }), 1));
 
-    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { "abc" }, 0));
-    EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(StringView { "abc" }, 1));
-    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "abc" }, 2));
-    EXPECT_EQ(3U, numCodeUnitsInGraphemeClusters(StringView { "abc" }, 3));
-    EXPECT_EQ(3U, numCodeUnitsInGraphemeClusters(StringView { "abc" }, 4));
+    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { "abc"_s }, 0));
+    EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(StringView { "abc"_s }, 1));
+    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "abc"_s }, 2));
+    EXPECT_EQ(3U, numCodeUnitsInGraphemeClusters(StringView { "abc"_s }, 3));
+    EXPECT_EQ(3U, numCodeUnitsInGraphemeClusters(StringView { "abc"_s }, 4));
 
     EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(makeUTF16({ 'a', 'b', 'c' }), 0));
     EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(makeUTF16({ 'a', 'b', 'c' }), 1));
@@ -95,10 +95,10 @@
     EXPECT_EQ(3U, numCodeUnitsInGraphemeClusters(makeUTF16({ 'a', 'b', 'c' }), 3));
     EXPECT_EQ(3U, numCodeUnitsInGraphemeClusters(makeUTF16({ 'a', 'b', 'c' }), 4));
 
-    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { "\r\n" }, 0));
-    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "\r\n" }, 1));
-    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "\r\n" }, 2));
-    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "\r\n" }, 3));
+    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { "\r\n"_s }, 0));
+    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "\r\n"_s }, 1));
+    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "\r\n"_s }, 2));
+    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "\r\n"_s }, 3));
 
     EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(makeUTF16({ '\r', '\n' }), 0));
     EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(makeUTF16({ '\r', '\n' }), 1));
@@ -105,17 +105,17 @@
     EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(makeUTF16({ '\r', '\n' }), 2));
     EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(makeUTF16({ '\r', '\n' }), 3));
 
-    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { "\n\r" }, 0));
-    EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(StringView { "\n\r" }, 1));
-    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "\n\r" }, 2));
+    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { "\n\r"_s }, 0));
+    EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(StringView { "\n\r"_s }, 1));
+    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "\n\r"_s }, 2));
 
     EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(makeUTF16({ '\n', '\r' }), 1));
     EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(makeUTF16({ '\n', '\r' }), 2));
 
-    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { "\r\n\r" }, 0));
-    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "\r\n\r" }, 1));
-    EXPECT_EQ(3U, numCodeUnitsInGraphemeClusters(StringView { "\r\n\r" }, 2));
-    EXPECT_EQ(3U, numCodeUnitsInGraphemeClusters(StringView { "\r\n\r" }, 3));
+    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { "\r\n\r"_s }, 0));
+    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "\r\n\r"_s }, 1));
+    EXPECT_EQ(3U, numCodeUnitsInGraphemeClusters(StringView { "\r\n\r"_s }, 2));
+    EXPECT_EQ(3U, numCodeUnitsInGraphemeClusters(StringView { "\r\n\r"_s }, 3));
 
     EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(makeUTF16({ '\r', '\n', '\r' }), 0));
     EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(makeUTF16({ '\r', '\n', '\r' }), 1));
@@ -128,12 +128,12 @@
 
     EXPECT_EQ(1U, numCodeUnitsInGraphemeClusters(makeUTF16({ 0x308, 'g' }), 1));
 
-    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { "\r\nbc" }, 0));
-    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "\r\nbc" }, 1));
-    EXPECT_EQ(3U, numCodeUnitsInGraphemeClusters(StringView { "\r\nbc" }, 2));
-    EXPECT_EQ(4U, numCodeUnitsInGraphemeClusters(StringView { "\r\nbc" }, 3));
-    EXPECT_EQ(4U, numCodeUnitsInGraphemeClusters(StringView { "\r\nbc" }, 4));
-    EXPECT_EQ(4U, numCodeUnitsInGraphemeClusters(StringView { "\r\nbc" }, 5));
+    EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(StringView { "\r\nbc"_s }, 0));
+    EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(StringView { "\r\nbc"_s }, 1));
+    EXPECT_EQ(3U, numCodeUnitsInGraphemeClusters(StringView { "\r\nbc"_s }, 2));
+    EXPECT_EQ(4U, numCodeUnitsInGraphemeClusters(StringView { "\r\nbc"_s }, 3));
+    EXPECT_EQ(4U, numCodeUnitsInGraphemeClusters(StringView { "\r\nbc"_s }, 4));
+    EXPECT_EQ(4U, numCodeUnitsInGraphemeClusters(StringView { "\r\nbc"_s }, 5));
 
     EXPECT_EQ(0U, numCodeUnitsInGraphemeClusters(makeUTF16({ 'g', 0x308, 'b', 'c' }), 0));
     EXPECT_EQ(2U, numCodeUnitsInGraphemeClusters(makeUTF16({ 'g', 0x308, 'b', 'c' }), 1));

Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ISOBox.cpp (294915 => 294916)


--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ISOBox.cpp	2022-05-27 00:23:14 UTC (rev 294915)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ISOBox.cpp	2022-05-27 00:50:02 UTC (rev 294916)
@@ -38,11 +38,11 @@
 
 namespace TestWebKitAPI {
 
-static const char* base64EncodedSinfWithKeyID3 = "AAAAYXNpbmYAAAAMZnJtYW1wNGEAAAAUc2NobQAAAABjYmNzAAEAAAAAADlzY2hpAAAAMXRlbmMBAAAAAAABAAAAAAAAAAAAAAAAAAAAAAMQ1fvWuC7ZPk75iuQJMe4ztw==";
+static constexpr auto base64EncodedSinfWithKeyID3 = "AAAAYXNpbmYAAAAMZnJtYW1wNGEAAAAUc2NobQAAAABjYmNzAAEAAAAAADlzY2hpAAAAMXRlbmMBAAAAAAABAAAAAAAAAAAAAAAAAAAAAAMQ1fvWuC7ZPk75iuQJMe4ztw=="_s;
 
 TEST(ISOBox, ISOProtectionSchemeInfoBox)
 {
-    auto sinfArray = base64Decode(StringView(base64EncodedSinfWithKeyID3));
+    auto sinfArray = base64Decode(StringView { base64EncodedSinfWithKeyID3 });
     ASSERT_TRUE(sinfArray);
     ASSERT_EQ(97UL, sinfArray->size());
 
@@ -74,7 +74,7 @@
     ASSERT_EQ(defaultIV, trackEncryptionBox->defaultConstantIV());
 }
 
-static const char* base64EncodedPsshWithAssetId = "AAAAsHBzc2gAAAAAlM6G+wf/T0OtuJPS+paMogAAAJAAAACQZnBzZAAAABBmcHNpAAAAAGNlbmMAAAA8ZnBzawAAABxma3JpAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAYZmthaQAAAAAAAAAAAAAAAAAAAPEAAAA8ZnBzawAAABxma3JpAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAYZmthaQAAAAAAAAAAAAAAAAAAAPI=";
+static constexpr auto base64EncodedPsshWithAssetId = "AAAAsHBzc2gAAAAAlM6G+wf/T0OtuJPS+paMogAAAJAAAACQZnBzZAAAABBmcHNpAAAAAGNlbmMAAAA8ZnBzawAAABxma3JpAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAYZmthaQAAAAAAAAAAAAAAAAAAAPEAAAA8ZnBzawAAABxma3JpAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAYZmthaQAAAAAAAAAAAAAAAAAAAPI="_s;
 
 TEST(ISOBox, ISOFairPlayStreamingPsshBox)
 {

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to