Changeset 284767 in webkit

Timestamp:

Oct 24, 2021, 1:43:41 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
<rdar://problem/84478389>

Reviewed by Darin Adler.

r284566 didn't actually fix the problem. The problem was that the
first template argument of ImagePaintingOptions template construct
can instantiated with std::optional<ImagePaintingOptions>. It
should be a type of that setOption can take.

• platform/graphics/ImagePaintingOptions.h: Added a template

variable isOptionType, and use it for SFINAE.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-24  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
+        <rdar://problem/84478389>
+
+        Reviewed by Darin Adler.
+
+        r284566 didn't actually fix the problem. The problem was that the
+        first template argument of ImagePaintingOptions template construct
+        can instantiated with std::optional<ImagePaintingOptions>. It
+        should be a type of that setOption can take.
+
+        * platform/graphics/ImagePaintingOptions.h: Added a template
+        variable isOptionType, and use it for SFINAE.
+
 2021-10-24  Darin Adler  <darin@apple.com>
 

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

@@ -33 +33 @@
 
 struct ImagePaintingOptions {
-    template<typename First, typename... Rest, typename = std::enable_if_t<!std::is_same_v<std::decay_t<First>, ImagePaintingOptions>>>
+    template<typename Type> static constexpr bool isOptionType =
+        std::is_same_v<Type, CompositeOperator>
+        || std::is_same_v<Type, BlendMode>
+        || std::is_same_v<Type, DecodingMode>
+        || std::is_same_v<Type, ImageOrientation>
+        || std::is_same_v<Type, ImageOrientation::Orientation>
+        || std::is_same_v<Type, InterpolationQuality>;
+
+    template<typename First, typename... Rest, typename = std::enable_if_t<isOptionType<std::decay_t<First>>>>
     ImagePaintingOptions(First first, Rest... rest)
     {