Diff
Modified: trunk/Source/WebCore/ChangeLog (292439 => 292440)
--- trunk/Source/WebCore/ChangeLog 2022-04-05 23:19:46 UTC (rev 292439)
+++ trunk/Source/WebCore/ChangeLog 2022-04-05 23:28:55 UTC (rev 292440)
@@ -1,3 +1,14 @@
+2022-04-05 Stephan Szabo <stephan.sz...@sony.com>
+
+ [PlayStation[ Fix build break after r292408
+ https://bugs.webkit.org/show_bug.cgi?id=238840
+
+ Unreviewed build fix.
+
+ * platform/LocalizedStrings.cpp:
+ * platform/network/playstation/CurlSSLHandlePlayStation.cpp:
+ * platform/playstation/UserAgentPlayStation.cpp:
+
2022-04-05 Matt Woodrow <mattwood...@apple.com>
Support transitions/animations on grid-template-columns|rows
Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (292439 => 292440)
--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2022-04-05 23:19:46 UTC (rev 292439)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2022-04-05 23:28:55 UTC (rev 292440)
@@ -82,7 +82,7 @@
return String::fromUTF8(result.get());
#else
notImplemented();
- return format;
+ return String::fromUTF8(format);
#endif
}
#endif
Modified: trunk/Source/WebCore/platform/network/playstation/CurlSSLHandlePlayStation.cpp (292439 => 292440)
--- trunk/Source/WebCore/platform/network/playstation/CurlSSLHandlePlayStation.cpp 2022-04-05 23:19:46 UTC (rev 292439)
+++ trunk/Source/WebCore/platform/network/playstation/CurlSSLHandlePlayStation.cpp 2022-04-05 23:28:55 UTC (rev 292440)
@@ -40,8 +40,8 @@
if (certificateData->size())
setCACertData(WTFMove(caCertData));
- setCipherList(CertificateStore::cipherSuites());
- setCurvesList(CertificateStore::supportedGroups());
+ setCipherList(String::fromUTF8(CertificateStore::cipherSuites()));
+ setCurvesList(String::fromUTF8(CertificateStore::supportedGroups()));
setIgnoreSSLErrors(CertificateStore::shouldIgnoreTLSErrors());
}
Modified: trunk/Source/WebCore/platform/playstation/UserAgentPlayStation.cpp (292439 => 292440)
--- trunk/Source/WebCore/platform/playstation/UserAgentPlayStation.cpp 2022-04-05 23:19:46 UTC (rev 292439)
+++ trunk/Source/WebCore/platform/playstation/UserAgentPlayStation.cpp 2022-04-05 23:28:55 UTC (rev 292440)
@@ -43,9 +43,9 @@
#if HAS_GETENV_NP
char buf[32];
if (!getenv_np("SYSTEM_SOFTWARE_NAME", buf, sizeof(buf)))
- return buf;
+ return String::fromUTF8(buf);
#endif
- return "PlayStation";
+ return "PlayStation"_s;
}
static String getSystemSoftwareVersion()
@@ -53,9 +53,9 @@
#if HAS_GETENV_NP
char buf[32];
if (!getenv_np("SYSTEM_SOFTWARE_VERSION", buf, sizeof(buf)))
- return buf;
+ return String::fromUTF8(buf);
#endif
- return "0.00";
+ return "0.00"_s;
}
static constexpr const char* versionForUAString()
@@ -87,7 +87,7 @@
String finalApplicationVersion = applicationVersion;
if (finalApplicationVersion.isEmpty())
- finalApplicationVersion = versionForUAString();
+ finalApplicationVersion = String::fromUTF8(versionForUAString());
return makeString(standardUserAgentStatic(), ' ', applicationName, '/', finalApplicationVersion);
}
Modified: trunk/Source/WebKit/ChangeLog (292439 => 292440)
--- trunk/Source/WebKit/ChangeLog 2022-04-05 23:19:46 UTC (rev 292439)
+++ trunk/Source/WebKit/ChangeLog 2022-04-05 23:28:55 UTC (rev 292440)
@@ -1,3 +1,12 @@
+2022-04-05 Stephan Szabo <stephan.sz...@sony.com>
+
+ [PlayStation[ Fix build break after r292408
+ https://bugs.webkit.org/show_bug.cgi?id=238840
+
+ Unreviewed build fix.
+
+ * UIProcess/API/C/playstation/WKPagePrivatePlayStation.cpp:
+
2022-04-05 Alex Christensen <achristen...@webkit.org>
Revert r291598
Modified: trunk/Source/WebKit/UIProcess/API/C/playstation/WKPagePrivatePlayStation.cpp (292439 => 292440)
--- trunk/Source/WebKit/UIProcess/API/C/playstation/WKPagePrivatePlayStation.cpp 2022-04-05 23:19:46 UTC (rev 292439)
+++ trunk/Source/WebKit/UIProcess/API/C/playstation/WKPagePrivatePlayStation.cpp 2022-04-05 23:28:55 UTC (rev 292440)
@@ -74,7 +74,7 @@
NativeWebKeyboardEvent::HandledByInputMethod handledByInputMethod = NativeWebKeyboardEvent::HandledByInputMethod::No;
std::optional<Vector<WebCore::CompositionUnderline>> preeditUnderlines;
std::optional<WebKit::EditingRange> preeditSelectionRange;
- WebKit::toImpl(pageRef)->handleKeyboardEvent(NativeWebKeyboardEvent(&wpeEvent, "", handledByInputMethod, WTFMove(preeditUnderlines), WTFMove(preeditSelectionRange)));
+ WebKit::toImpl(pageRef)->handleKeyboardEvent(NativeWebKeyboardEvent(&wpeEvent, ""_s, handledByInputMethod, WTFMove(preeditUnderlines), WTFMove(preeditSelectionRange)));
}
void WKPageHandleMouseEvent(WKPageRef pageRef, WKMouseEvent event)
