Title: [283284] trunk/Source
Revision
283284
Author
[email protected]
Date
2021-09-29 17:00:16 -0700 (Wed, 29 Sep 2021)

Log Message

[WinCairo] REGRESSION(r280726): registry keys enabling GPU process mode don't work
https://bugs.webkit.org/show_bug.cgi?id=230871

Reviewed by Don Olmstead.

Source/WebKit:

r270175 (Bug 219294) added registry keys to enable GPU process
mode for WinCairo port. But after r280726 (Bug 228803) changed the
function signature, they didn't work.

* Shared/WebPreferencesDefaultValues.cpp:
* Shared/win/WebPreferencesDefaultValuesWin.cpp:
(WebKit::isFeatureFlagEnabled):

Source/WTF:

* wtf/PlatformHave.h: r270175 defined HAVE_SYSTEM_FEATURE_FLAGS
for Windows to use WebKit::isFeatureFlagEnabled. But, it is no
longer needed.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (283283 => 283284)


--- trunk/Source/WTF/ChangeLog	2021-09-29 23:56:07 UTC (rev 283283)
+++ trunk/Source/WTF/ChangeLog	2021-09-30 00:00:16 UTC (rev 283284)
@@ -1,3 +1,14 @@
+2021-09-29  Fujii Hironori  <[email protected]>
+
+        [WinCairo] REGRESSION(r280726): registry keys enabling GPU process mode don't work
+        https://bugs.webkit.org/show_bug.cgi?id=230871
+
+        Reviewed by Don Olmstead.
+
+        * wtf/PlatformHave.h: r270175 defined HAVE_SYSTEM_FEATURE_FLAGS
+        for Windows to use WebKit::isFeatureFlagEnabled. But, it is no
+        longer needed.
+
 2021-09-29  Kiet Ho  <[email protected]>
 
         Implement the 'ic' unit from CSS Values 4

Modified: trunk/Source/WTF/wtf/PlatformHave.h (283283 => 283284)


--- trunk/Source/WTF/wtf/PlatformHave.h	2021-09-29 23:56:07 UTC (rev 283283)
+++ trunk/Source/WTF/wtf/PlatformHave.h	2021-09-30 00:00:16 UTC (rev 283284)
@@ -669,8 +669,7 @@
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) \
     || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000) \
     || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 70000) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000) \
-    || PLATFORM(WIN)
+    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 140000)
 #define HAVE_SYSTEM_FEATURE_FLAGS 1
 #endif
 

Modified: trunk/Source/WebKit/ChangeLog (283283 => 283284)


--- trunk/Source/WebKit/ChangeLog	2021-09-29 23:56:07 UTC (rev 283283)
+++ trunk/Source/WebKit/ChangeLog	2021-09-30 00:00:16 UTC (rev 283284)
@@ -1,3 +1,18 @@
+2021-09-29  Fujii Hironori  <[email protected]>
+
+        [WinCairo] REGRESSION(r280726): registry keys enabling GPU process mode don't work
+        https://bugs.webkit.org/show_bug.cgi?id=230871
+
+        Reviewed by Don Olmstead.
+
+        r270175 (Bug 219294) added registry keys to enable GPU process
+        mode for WinCairo port. But after r280726 (Bug 228803) changed the
+        function signature, they didn't work.
+
+        * Shared/WebPreferencesDefaultValues.cpp:
+        * Shared/win/WebPreferencesDefaultValuesWin.cpp:
+        (WebKit::isFeatureFlagEnabled):
+
 2021-09-29  Chris Dumez  <[email protected]>
 
         [ iOS Debug ] http/tests/xmlhttprequest/access-control-preflight-credential-sync.html is a flaky crash

Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (283283 => 283284)


--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp	2021-09-29 23:56:07 UTC (rev 283283)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp	2021-09-30 00:00:16 UTC (rev 283284)
@@ -41,7 +41,7 @@
 
 namespace WebKit {
 
-#if !PLATFORM(COCOA)
+#if !PLATFORM(COCOA) && !PLATFORM(WIN)
 bool isFeatureFlagEnabled(const char*, bool defaultValue)
 {
     return defaultValue;

Modified: trunk/Source/WebKit/Shared/win/WebPreferencesDefaultValuesWin.cpp (283283 => 283284)


--- trunk/Source/WebKit/Shared/win/WebPreferencesDefaultValuesWin.cpp	2021-09-29 23:56:07 UTC (rev 283283)
+++ trunk/Source/WebKit/Shared/win/WebPreferencesDefaultValuesWin.cpp	2021-09-30 00:00:16 UTC (rev 283284)
@@ -26,19 +26,18 @@
 #include "config.h"
 #include "WebPreferencesDefaultValues.h"
 
-#if HAVE(SYSTEM_FEATURE_FLAGS)
-
 #include <wtf/WindowsExtras.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebKit {
 
-bool isFeatureFlagEnabled(const String& featureName)
+bool isFeatureFlagEnabled(const char* featureName, bool defaultValue)
 {
+    auto featureNameWide = String(featureName).wideCharacters();
     DWORD data;
     DWORD dataSize = sizeof data;
     DWORD keyType;
-    HRESULT hr = getRegistryValue(HKEY_CURRENT_USER, L"Software\\WebKit", featureName.wideCharacters().data(), &keyType, &data, &dataSize);
+    HRESULT hr = getRegistryValue(HKEY_CURRENT_USER, L"Software\\WebKit", featureNameWide.data(), &keyType, &data, &dataSize);
     if (hr != ERROR_SUCCESS)
         return false;
     if (keyType != REG_DWORD)
@@ -49,5 +48,3 @@
 }
 
 } // namespace WebKit
-
-#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to