Modified: trunk/Source/WebCore/ChangeLog (276146 => 276147)
--- trunk/Source/WebCore/ChangeLog 2021-04-16 18:07:23 UTC (rev 276146)
+++ trunk/Source/WebCore/ChangeLog 2021-04-16 18:17:21 UTC (rev 276147)
@@ -1,5 +1,20 @@
2021-04-16 Chris Dumez <[email protected]>
+ 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 <[email protected]>
+
Unreviewed attempt to fix GTK's build after Antoine's r276141.
* platform/graphics/nicosia/NicosiaAnimation.cpp:
Modified: trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp (276146 => 276147)
--- trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2021-04-16 18:07:23 UTC (rev 276146)
+++ trunk/Source/WebCore/animation/CSSPropertyAnimation.cpp 2021-04-16 18:17:21 UTC (rev 276147)
@@ -75,7 +75,7 @@
const CSSPropertyBlendingClient* client { nullptr };
CSSPropertyBlendingContext(double progress, bool isDiscrete, const CSSPropertyBlendingClient* client)
- : BlendingContext { progress, isDiscrete }
+ : BlendingContext(progress, isDiscrete)
, client(client)
{
}
Modified: trunk/Source/WebCore/platform/animation/AnimationUtilities.h (276146 => 276147)
--- trunk/Source/WebCore/platform/animation/AnimationUtilities.h 2021-04-16 18:07:23 UTC (rev 276146)
+++ trunk/Source/WebCore/platform/animation/AnimationUtilities.h 2021-04-16 18:17:21 UTC (rev 276147)
@@ -33,6 +33,12 @@
struct BlendingContext {
double progress { 0 };
bool isDiscrete { false };
+
+ BlendingContext(double progress = 0, bool isDiscrete = false)
+ : progress(progress)
+ , isDiscrete(isDiscrete)
+ {
+ }
};
inline int blend(int from, int to, const BlendingContext& context)
Modified: trunk/Source/WebCore/platform/graphics/nicosia/NicosiaAnimation.cpp (276146 => 276147)
--- trunk/Source/WebCore/platform/graphics/nicosia/NicosiaAnimation.cpp 2021-04-16 18:07:23 UTC (rev 276146)
+++ trunk/Source/WebCore/platform/graphics/nicosia/NicosiaAnimation.cpp 2021-04-16 18:17:21 UTC (rev 276147)
@@ -28,7 +28,7 @@
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);
}
static FilterOperations applyFilterAnimation(const FilterOperations& from, const FilterOperations& to, double progress, const FloatSize& boxSize)
@@ -138,7 +138,7 @@
if (!to.size()) {
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;
}
@@ -146,7 +146,7 @@
if (!from.size()) {
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;
}
@@ -153,7 +153,7 @@
// Normal animation with a matching operation list.
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;
}
