Title: [292413] trunk/Source
- Revision
- 292413
- Author
- cdu...@apple.com
- Date
- 2022-04-05 12:54:03 -0700 (Tue, 05 Apr 2022)
Log Message
Unreviewed WinCairo build fix after r292408.
Source/WebCore:
* platform/win/GDIObjectCounter.cpp:
(WebCore::GDIObjectCounter::GDIObjectCounter):
* platform/win/GDIObjectCounter.h:
Source/WebKitLegacy/win:
* WebView.cpp:
(imeNotificationName):
(imeRequestName):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (292412 => 292413)
--- trunk/Source/WebCore/ChangeLog 2022-04-05 19:47:28 UTC (rev 292412)
+++ trunk/Source/WebCore/ChangeLog 2022-04-05 19:54:03 UTC (rev 292413)
@@ -1,5 +1,13 @@
2022-04-05 Chris Dumez <cdu...@apple.com>
+ Unreviewed WinCairo build fix after r292408.
+
+ * platform/win/GDIObjectCounter.cpp:
+ (WebCore::GDIObjectCounter::GDIObjectCounter):
+ * platform/win/GDIObjectCounter.h:
+
+2022-04-05 Chris Dumez <cdu...@apple.com>
+
Unreviewed Windows debug build fix after r292279.
* animation/CSSPropertyAnimation.cpp:
Modified: trunk/Source/WebCore/platform/win/GDIObjectCounter.cpp (292412 => 292413)
--- trunk/Source/WebCore/platform/win/GDIObjectCounter.cpp 2022-04-05 19:47:28 UTC (rev 292412)
+++ trunk/Source/WebCore/platform/win/GDIObjectCounter.cpp 2022-04-05 19:54:03 UTC (rev 292413)
@@ -40,9 +40,9 @@
namespace WebCore {
-GDIObjectCounter::GDIObjectCounter(const String& identifier)
+GDIObjectCounter::GDIObjectCounter(const char* identifier)
{
- init(identifier);
+ init(String { identifier });
}
GDIObjectCounter::GDIObjectCounter(const String& className, void* instance)
Modified: trunk/Source/WebCore/platform/win/GDIObjectCounter.h (292412 => 292413)
--- trunk/Source/WebCore/platform/win/GDIObjectCounter.h 2022-04-05 19:47:28 UTC (rev 292412)
+++ trunk/Source/WebCore/platform/win/GDIObjectCounter.h 2022-04-05 19:54:03 UTC (rev 292413)
@@ -43,7 +43,7 @@
class GDIObjectCounter {
public:
- GDIObjectCounter(const String& identifier);
+ GDIObjectCounter(const char* identifier);
GDIObjectCounter(const String& className, void* instance);
~GDIObjectCounter();
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (292412 => 292413)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2022-04-05 19:47:28 UTC (rev 292412)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2022-04-05 19:54:03 UTC (rev 292413)
@@ -1,5 +1,13 @@
2022-04-05 Chris Dumez <cdu...@apple.com>
+ Unreviewed WinCairo build fix after r292408.
+
+ * WebView.cpp:
+ (imeNotificationName):
+ (imeRequestName):
+
+2022-04-05 Chris Dumez <cdu...@apple.com>
+
Mark String(const char*) constructor as explicit
https://bugs.webkit.org/show_bug.cgi?id=238693
Modified: trunk/Source/WebKitLegacy/win/WebView.cpp (292412 => 292413)
--- trunk/Source/WebKitLegacy/win/WebView.cpp 2022-04-05 19:47:28 UTC (rev 292412)
+++ trunk/Source/WebKitLegacy/win/WebView.cpp 2022-04-05 19:54:03 UTC (rev 292413)
@@ -6079,31 +6079,31 @@
{
switch (wparam) {
case IMN_CHANGECANDIDATE:
- return "IMN_CHANGECANDIDATE";
+ return "IMN_CHANGECANDIDATE"_s;
case IMN_CLOSECANDIDATE:
- return "IMN_CLOSECANDIDATE";
+ return "IMN_CLOSECANDIDATE"_s;
case IMN_CLOSESTATUSWINDOW:
- return "IMN_CLOSESTATUSWINDOW";
+ return "IMN_CLOSESTATUSWINDOW"_s;
case IMN_GUIDELINE:
- return "IMN_GUIDELINE";
+ return "IMN_GUIDELINE"_s;
case IMN_OPENCANDIDATE:
- return "IMN_OPENCANDIDATE";
+ return "IMN_OPENCANDIDATE"_s;
case IMN_OPENSTATUSWINDOW:
- return "IMN_OPENSTATUSWINDOW";
+ return "IMN_OPENSTATUSWINDOW"_s;
case IMN_SETCANDIDATEPOS:
- return "IMN_SETCANDIDATEPOS";
+ return "IMN_SETCANDIDATEPOS"_s;
case IMN_SETCOMPOSITIONFONT:
- return "IMN_SETCOMPOSITIONFONT";
+ return "IMN_SETCOMPOSITIONFONT"_s;
case IMN_SETCOMPOSITIONWINDOW:
- return "IMN_SETCOMPOSITIONWINDOW";
+ return "IMN_SETCOMPOSITIONWINDOW"_s;
case IMN_SETCONVERSIONMODE:
- return "IMN_SETCONVERSIONMODE";
+ return "IMN_SETCONVERSIONMODE"_s;
case IMN_SETOPENSTATUS:
- return "IMN_SETOPENSTATUS";
+ return "IMN_SETOPENSTATUS"_s;
case IMN_SETSENTENCEMODE:
- return "IMN_SETSENTENCEMODE";
+ return "IMN_SETSENTENCEMODE"_s;
case IMN_SETSTATUSWINDOWPOS:
- return "IMN_SETSTATUSWINDOWPOS";
+ return "IMN_SETSTATUSWINDOWPOS"_s;
default:
return "Unknown (" + String::number(wparam) + ")";
}
@@ -6113,19 +6113,19 @@
{
switch (wparam) {
case IMR_CANDIDATEWINDOW:
- return "IMR_CANDIDATEWINDOW";
+ return "IMR_CANDIDATEWINDOW"_s;
case IMR_COMPOSITIONFONT:
- return "IMR_COMPOSITIONFONT";
+ return "IMR_COMPOSITIONFONT"_s;
case IMR_COMPOSITIONWINDOW:
- return "IMR_COMPOSITIONWINDOW";
+ return "IMR_COMPOSITIONWINDOW"_s;
case IMR_CONFIRMRECONVERTSTRING:
- return "IMR_CONFIRMRECONVERTSTRING";
+ return "IMR_CONFIRMRECONVERTSTRING"_s;
case IMR_DOCUMENTFEED:
- return "IMR_DOCUMENTFEED";
+ return "IMR_DOCUMENTFEED"_s;
case IMR_QUERYCHARPOSITION:
- return "IMR_QUERYCHARPOSITION";
+ return "IMR_QUERYCHARPOSITION"_s;
case IMR_RECONVERTSTRING:
- return "IMR_RECONVERTSTRING";
+ return "IMR_RECONVERTSTRING"_s;
default:
return "Unknown (" + String::number(wparam) + ")";
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
