Title: [276232] trunk/Source/WebCore
- Revision
- 276232
- Author
- wei...@apple.com
- Date
- 2021-04-18 14:14:38 -0700 (Sun, 18 Apr 2021)
Log Message
GraphicsLayer::distributeOpacity, GraphicsLayer::setOpacityInternal and GraphicsLayer::accumulatedOpacity are never used
https://bugs.webkit.org/show_bug.cgi?id=224732
Reviewed by Darin Adler.
Remove dead code.
* platform/graphics/GraphicsLayer.cpp:
(WebCore::GraphicsLayer::accumulatedOpacity const): Deleted.
(WebCore::GraphicsLayer::distributeOpacity): Deleted.
* platform/graphics/GraphicsLayer.h:
(WebCore::GraphicsLayer::setOpacityInternal): Deleted.
* platform/graphics/ca/GraphicsLayerCA.cpp:
* platform/graphics/ca/GraphicsLayerCA.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (276231 => 276232)
--- trunk/Source/WebCore/ChangeLog 2021-04-18 18:12:23 UTC (rev 276231)
+++ trunk/Source/WebCore/ChangeLog 2021-04-18 21:14:38 UTC (rev 276232)
@@ -1,3 +1,20 @@
+2021-04-18 Sam Weinig <wei...@apple.com>
+
+ GraphicsLayer::distributeOpacity, GraphicsLayer::setOpacityInternal and GraphicsLayer::accumulatedOpacity are never used
+ https://bugs.webkit.org/show_bug.cgi?id=224732
+
+ Reviewed by Darin Adler.
+
+ Remove dead code.
+
+ * platform/graphics/GraphicsLayer.cpp:
+ (WebCore::GraphicsLayer::accumulatedOpacity const): Deleted.
+ (WebCore::GraphicsLayer::distributeOpacity): Deleted.
+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::setOpacityInternal): Deleted.
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ * platform/graphics/ca/GraphicsLayerCA.h:
+
2021-04-18 Antoine Quint <grao...@webkit.org>
Fix interpolation of the rotate CSS property
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (276231 => 276232)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2021-04-18 18:12:23 UTC (rev 276231)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp 2021-04-18 21:14:38 UTC (rev 276232)
@@ -657,30 +657,6 @@
m_zPosition = position;
}
-float GraphicsLayer::accumulatedOpacity() const
-{
- if (!preserves3D())
- return 1;
-
- return m_opacity * (parent() ? parent()->accumulatedOpacity() : 1);
-}
-
-void GraphicsLayer::distributeOpacity(float accumulatedOpacity)
-{
- // If this is a transform layer we need to distribute our opacity to all our children
-
- // Incoming accumulatedOpacity is the contribution from our parent(s). We mutiply this by our own
- // opacity to get the total contribution
- accumulatedOpacity *= m_opacity;
-
- setOpacityInternal(accumulatedOpacity);
-
- if (preserves3D()) {
- for (auto& layer : children())
- layer->distributeOpacity(accumulatedOpacity);
- }
-}
-
static inline const FilterOperations& filterOperationsAt(const KeyframeValueList& valueList, size_t index)
{
return static_cast<const FilterAnimationValue&>(valueList.at(index)).value();
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.h (276231 => 276232)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2021-04-18 18:12:23 UTC (rev 276231)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayer.h 2021-04-18 21:14:38 UTC (rev 276232)
@@ -563,9 +563,6 @@
virtual float zPosition() const { return m_zPosition; }
WEBCORE_EXPORT virtual void setZPosition(float);
- WEBCORE_EXPORT virtual void distributeOpacity(float);
- WEBCORE_EXPORT virtual float accumulatedOpacity() const;
-
virtual FloatSize pixelAlignmentOffset() const { return FloatSize(); }
virtual void setAppliesPageScale(bool appliesScale = true) { m_appliesPageScale = appliesScale; }
@@ -662,8 +659,6 @@
virtual bool shouldRepaintOnSizeChange() const { return drawsContent(); }
- virtual void setOpacityInternal(float) { }
-
// The layer being replicated.
GraphicsLayer* replicatedLayer() const { return m_replicatedLayer; }
virtual void setReplicatedLayer(GraphicsLayer* layer) { m_replicatedLayer = layer; }
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (276231 => 276232)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2021-04-18 18:12:23 UTC (rev 276231)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp 2021-04-18 21:14:38 UTC (rev 276232)
@@ -4379,27 +4379,6 @@
return newLayer;
}
-void GraphicsLayerCA::setOpacityInternal(float accumulatedOpacity)
-{
- LayerMap* layerCloneMap = nullptr;
-
- if (preserves3D()) {
- m_layer->setOpacity(accumulatedOpacity);
- layerCloneMap = m_layerClones ? &m_layerClones->primaryLayerClones : nullptr;
- } else {
- primaryLayer()->setOpacity(accumulatedOpacity);
- layerCloneMap = primaryLayerClones();
- }
-
- if (layerCloneMap) {
- for (auto& clone : *layerCloneMap) {
- if (m_replicaLayer && isReplicatedRootClone(clone.key))
- continue;
- clone.value->setOpacity(m_opacity);
- }
- }
-}
-
void GraphicsLayerCA::updateOpacityOnLayer()
{
primaryLayer()->setOpacity(m_opacity);
Modified: trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (276231 => 276232)
--- trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2021-04-18 18:12:23 UTC (rev 276231)
+++ trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h 2021-04-18 21:14:38 UTC (rev 276232)
@@ -188,9 +188,6 @@
WEBCORE_EXPORT Vector<std::pair<String, double>> acceleratedAnimationsForTesting() const final;
-protected:
- WEBCORE_EXPORT void setOpacityInternal(float) override;
-
private:
bool isGraphicsLayerCA() const override { return true; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
