Changeset 276232 in webkit

Timestamp:

Apr 18, 2021, 2:14:38 PM (5 years ago)

Author:

weinig@apple.com

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsLayer.cpp (modified) (1 diff)
• platform/graphics/GraphicsLayer.h (modified) (2 diffs)
• platform/graphics/ca/GraphicsLayerCA.cpp (modified) (1 diff)
• platform/graphics/ca/GraphicsLayerCA.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-18  Sam Weinig  <weinig@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  <graouts@webkit.org>
 

trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

@@ -656 +656 @@
 {
     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);
-    }
 }
 

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

@@ -564 +564 @@
     WEBCORE_EXPORT virtual void setZPosition(float);
 
-    WEBCORE_EXPORT virtual void distributeOpacity(float);
-    WEBCORE_EXPORT virtual float accumulatedOpacity() const;
-
     virtual FloatSize pixelAlignmentOffset() const { return FloatSize(); }
     
@@ -662 +659 @@
 
     virtual bool shouldRepaintOnSizeChange() const { return drawsContent(); }
-
-    virtual void setOpacityInternal(float) { }
 
     // The layer being replicated.

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -4380 +4380 @@
 }
 
-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()
 {

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

@@ -189 +189 @@
     WEBCORE_EXPORT Vector<std::pair<String, double>> acceleratedAnimationsForTesting() const final;
 
-protected:
-    WEBCORE_EXPORT void setOpacityInternal(float) override;
-    
 private:
     bool isGraphicsLayerCA() const override { return true; }