Changeset 284566 in webkit

Timestamp:

Oct 20, 2021, 2:07:20 PM (5 years ago)

Author:

Fujii Hironori

Message:

The code decoding std::optional<ImagePaintingOptions> can't be compiled by PlayStation due to the ImagePaintingOptions template constructor
​https://bugs.webkit.org/show_bug.cgi?id=231980

Reviewed by Ross Kirsling.

PlayStation clang can't compile the following code.

std::optional<ImagePaintingOptions> val;
decoder >> val;

It reports the following error.

include\type_traits:3825:31: error: no member named 'value' in 'std::is_convertible<optional<WebCore::ImagePaintingOptions> &, WebCore::ImagePaintingOptions>'

• platform/graphics/ImagePaintingOptions.h:

(WebCore::ImagePaintingOptions::ImagePaintingOptions): Use SFINAE
for the first template constructor not to conflict with the second
one.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ImagePaintingOptions.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-20  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        The code decoding std::optional<ImagePaintingOptions> can't be compiled by PlayStation due to the ImagePaintingOptions template constructor
+        https://bugs.webkit.org/show_bug.cgi?id=231980
+
+        Reviewed by Ross Kirsling.
+
+        PlayStation clang can't compile the following code.
+        > std::optional<ImagePaintingOptions> val;
+        > decoder >> val;
+
+        It reports the following error.
+        > include\type_traits:3825:31: error: no member named 'value' in 'std::is_convertible<optional<WebCore::ImagePaintingOptions> &, WebCore::ImagePaintingOptions>'
+
+        * platform/graphics/ImagePaintingOptions.h:
+        (WebCore::ImagePaintingOptions::ImagePaintingOptions): Use SFINAE
+        for the first template constructor not to conflict with the second
+        one.
+
 2021-10-20  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebCore/platform/graphics/ImagePaintingOptions.h

@@ -33 +33 @@
 
 struct ImagePaintingOptions {
-    template<typename... Options>
-    ImagePaintingOptions(Options... options)
+    template<typename First, typename... Rest, typename = std::enable_if_t<!std::is_same_v<std::decay_t<First>, ImagePaintingOptions>>>
+    ImagePaintingOptions(First first, Rest... rest)
     {
-        setOption(options...);
+        setOption(first, rest...);
     }