Changeset 283284 in webkit

Timestamp:

Sep 29, 2021, 5:00:16 PM (5 years ago)

Author:

Fujii Hironori

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.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/WebPreferencesDefaultValues.cpp (modified) (1 diff)
• WebKit/Shared/win/WebPreferencesDefaultValuesWin.cpp (modified) (3 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-09-29  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [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  <tho22@apple.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -670 +670 @@
     || (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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-09-29  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [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  <cdumez@apple.com>
 

trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp

@@ -42 +42 @@
 namespace WebKit {
 
-#if !PLATFORM(COCOA)
+#if !PLATFORM(COCOA) && !PLATFORM(WIN)
 bool isFeatureFlagEnabled(const char*, bool defaultValue)
 {

trunk/Source/WebKit/Shared/win/WebPreferencesDefaultValuesWin.cpp

@@ -27 +27 @@
 #include "WebPreferencesDefaultValues.h"
 
-#if HAVE(SYSTEM_FEATURE_FLAGS)
-
 #include <wtf/WindowsExtras.h>
 #include <wtf/text/WTFString.h>
@@ -34 +32 @@
 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;
@@ -50 +49 @@
 
 } // namespace WebKit
-
-#endif