Changeset 276147 in webkit

Timestamp:

Apr 16, 2021, 11:17:21 AM (5 years ago)

Author:

Chris Dumez

Message:

Unreviewed GTK / WinCairo build fix after Antoine's r276141.

Just add the BlendingContext constructor this time because there are too many build failures.

• animation/CSSPropertyAnimation.cpp:

(WebCore::CSSPropertyBlendingContext::CSSPropertyBlendingContext):
(WebCore::CSSPropertyBlendingContext::client): Deleted.

• platform/animation/AnimationUtilities.h:

(WebCore::BlendingContext::BlendingContext):

• platform/graphics/nicosia/NicosiaAnimation.cpp:

(Nicosia::blendFunc):
(Nicosia::applyTransformAnimation):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• animation/CSSPropertyAnimation.cpp (modified) (1 diff)
• platform/animation/AnimationUtilities.h (modified) (1 diff)
• platform/graphics/nicosia/NicosiaAnimation.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-16  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed GTK / WinCairo build fix after Antoine's r276141.
+
+        Just add the BlendingContext constructor this time because there are too many build failures.
+
+        * animation/CSSPropertyAnimation.cpp:
+        (WebCore::CSSPropertyBlendingContext::CSSPropertyBlendingContext):
+        (WebCore::CSSPropertyBlendingContext::client): Deleted.
+        * platform/animation/AnimationUtilities.h:
+        (WebCore::BlendingContext::BlendingContext):
+        * platform/graphics/nicosia/NicosiaAnimation.cpp:
+        (Nicosia::blendFunc):
+        (Nicosia::applyTransformAnimation):
+
 2021-04-16  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp

@@ -76 +76 @@
 
     CSSPropertyBlendingContext(double progress, bool isDiscrete, const CSSPropertyBlendingClient* client)
-        : BlendingContext { progress, isDiscrete }
+        : BlendingContext(progress, isDiscrete)
         , client(client)
     {

trunk/Source/WebCore/platform/animation/AnimationUtilities.h

@@ -34 +34 @@
     double progress { 0 };
     bool isDiscrete { false };
+
+    BlendingContext(double progress = 0, bool isDiscrete = false)
+        : progress(progress)
+        , isDiscrete(isDiscrete)
+    {
+    }
 };
 

trunk/Source/WebCore/platform/graphics/nicosia/NicosiaAnimation.cpp

@@ -29 +29 @@
 static RefPtr<FilterOperation> blendFunc(FilterOperation* fromOp, FilterOperation& toOp, double progress, const FloatSize&, bool blendToPassthrough = false)
 {
-    return toOp.blend(fromOp, { progress }, blendToPassthrough);
+    return toOp.blend(fromOp, progress, blendToPassthrough);
 }
 
@@ -139 +139 @@
         TransformOperations blended(from);
         for (auto& operation : blended.operations())
-            operation->blend(nullptr, { progress }, true)->apply(matrix, boxSize);
+            operation->blend(nullptr, progress, true)->apply(matrix, boxSize);
         return matrix;
     }
@@ -147 +147 @@
         TransformOperations blended(to);
         for (auto& operation : blended.operations())
-            operation->blend(nullptr, { 1 - progress }, true)->apply(matrix, boxSize);
+            operation->blend(nullptr, 1 - progress, true)->apply(matrix, boxSize);
         return matrix;
     }
@@ -154 +154 @@
     TransformOperations blended(to);
     for (size_t i = 0; i < blended.operations().size(); ++i)
-        blended.operations()[i]->blend(from.at(i), { progress }, !from.at(i))->apply(matrix, boxSize);
+        blended.operations()[i]->blend(from.at(i), progress, !from.at(i))->apply(matrix, boxSize);
     return matrix;
 }