Changeset 98762 in webkit

Timestamp:

Oct 28, 2011, 2:26:57 PM (15 years ago)

Author:

Simon Fraser

Message:

Remove Leopard-only code from GraphicsLayerCA
​https://bugs.webkit.org/show_bug.cgi?id=71141

Reviewed by Chris Marrin.

Remove !HAVE_MODERN_QUARTZCORE code, which was only
used on Leopard. updateContentsTransform() became a no-op,
so could be removed.

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::getValueFunctionNameForTransformOperation):
(WebCore::GraphicsLayerCA::GraphicsLayerCA):
(WebCore::GraphicsLayerCA::addAnimation):
(WebCore::GraphicsLayerCA::updateGeometry):
(WebCore::GraphicsLayerCA::setTransformAnimationEndpoints):
(WebCore::GraphicsLayerCA::setTransformAnimationKeyframes):
(WebCore::GraphicsLayerCA::swapFromOrToTiledLayer):
(WebCore::GraphicsLayerCA::defaultContentsOrientation):
(WebCore::GraphicsLayerCA::updateOpacityOnLayer):

• platform/graphics/ca/GraphicsLayerCA.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-28  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove Leopard-only code from GraphicsLayerCA
+        https://bugs.webkit.org/show_bug.cgi?id=71141
+
+        Reviewed by Chris Marrin.
+
+        Remove !HAVE_MODERN_QUARTZCORE code, which was only
+        used on Leopard. updateContentsTransform() became a no-op,
+        so could be removed.
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::getValueFunctionNameForTransformOperation):
+        (WebCore::GraphicsLayerCA::GraphicsLayerCA):
+        (WebCore::GraphicsLayerCA::addAnimation):
+        (WebCore::GraphicsLayerCA::updateGeometry):
+        (WebCore::GraphicsLayerCA::setTransformAnimationEndpoints):
+        (WebCore::GraphicsLayerCA::setTransformAnimationKeyframes):
+        (WebCore::GraphicsLayerCA::swapFromOrToTiledLayer):
+        (WebCore::GraphicsLayerCA::defaultContentsOrientation):
+        (WebCore::GraphicsLayerCA::updateOpacityOnLayer):
+        * platform/graphics/ca/GraphicsLayerCA.h:
+
 2011-10-28  Adrienne Walker  <enne@google.com>
 

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

@@ -49 +49 @@
 
 using namespace std;
-
-#define HAVE_MODERN_QUARTZCORE (!defined(BUILDING_ON_LEOPARD))
 
 namespace WebCore {
@@ -172 +170 @@
 }
 
-#if HAVE_MODERN_QUARTZCORE
 static PlatformCAAnimation::ValueFunctionType getValueFunctionNameForTransformOperation(TransformOperation::OperationType transformType)
 {
@@ -205 +202 @@
     }
 }
-#endif
 
 static String propertyIdToString(AnimatedPropertyID property)
@@ -256 +252 @@
     m_layer = PlatformCALayer::create(PlatformCALayer::LayerTypeWebLayer, this);
 
-#if !HAVE_MODERN_QUARTZCORE
-    setContentsOrientation(defaultContentsOrientation());
-#endif
-
     updateDebugIndicators();
     noteLayerPropertyChanged(ContentsScaleChanged);
@@ -627 +619 @@
     if (!anim || anim->isEmptyOrZeroDuration() || valueList.size() < 2)
         return false;
-
-#if !HAVE_MODERN_QUARTZCORE
-    // Older versions of QuartzCore do not handle opacity in transform layers properly, so we will
-    // always do software animation in that case.
-    if (valueList.property() == AnimatedPropertyOpacity)
-        return false;
-#endif
 
     // CoreAnimation does not handle the steps() timing function. Fall back
@@ -1145 +1130 @@
         }
     }
-
-    // Contents transform may depend on height.
-    updateContentsTransform();
 }
 
@@ -1942 +1924 @@
     basicAnim->setTimingFunction(timingFunction);
 
-#if HAVE_MODERN_QUARTZCORE
     PlatformCAAnimation::ValueFunctionType valueFunction = getValueFunctionNameForTransformOperation(transformOpType);
     if (valueFunction != PlatformCAAnimation::NoValueFunction)
         basicAnim->setValueFunction(valueFunction);
-#endif
 
     return true;
@@ -2007 +1987 @@
     keyframeAnim->setTimingFunctions(timingFunctions);
 
-#if HAVE_MODERN_QUARTZCORE
     PlatformCAAnimation::ValueFunctionType valueFunction = getValueFunctionNameForTransformOperation(transformOpType);
     if (valueFunction != PlatformCAAnimation::NoValueFunction)
         keyframeAnim->setValueFunction(valueFunction);
-#endif
+
     return true;
 }
@@ -2170 +2149 @@
     }
 #endif
-    
-    if (useTiledLayer) {
-#if !HAVE_MODERN_QUARTZCORE
-        // Tiled layer has issues with flipped coordinates.
-        setContentsOrientation(CompositingCoordinatesTopDown);
-#endif
-    } else {
-#if !HAVE_MODERN_QUARTZCORE
-        setContentsOrientation(GraphicsLayerCA::defaultContentsOrientation());
-#endif
-    }
 
     m_layer->adoptSublayers(oldLayer.get());
@@ -2194 +2162 @@
     if (oldLayer->superlayer())
         oldLayer->superlayer()->replaceSublayer(oldLayer.get(), m_layer.get());
-
-    updateContentsTransform();
 
     updateGeometry(pageScaleFactor, positionRelativeToBase);
@@ -2226 +2192 @@
 GraphicsLayer::CompositingCoordinatesOrientation GraphicsLayerCA::defaultContentsOrientation() const
 {
-#if !HAVE_MODERN_QUARTZCORE
-    // Older QuartzCore does not support -geometryFlipped, so we manually flip the root
-    // layer geometry, and then flip the contents of each layer back so that the CTM for CG
-    // is unflipped, allowing it to do the correct font auto-hinting.
-    return CompositingCoordinatesBottomUp;
-#else
     return CompositingCoordinatesTopDown;
-#endif
-}
-
-void GraphicsLayerCA::updateContentsTransform()
-{
-#if !HAVE_MODERN_QUARTZCORE
-    if (contentsOrientation() == CompositingCoordinatesBottomUp) {
-        CGAffineTransform contentsTransform = CGAffineTransformMakeScale(1, -1);
-        contentsTransform = CGAffineTransformTranslate(contentsTransform, 0, -m_layer->bounds().size().height());
-        m_layer->setContentsTransform(TransformationMatrix(contentsTransform));
-    }
-#endif
 }
 
@@ -2490 +2438 @@
 void GraphicsLayerCA::updateOpacityOnLayer()
 {
-#if !HAVE_MODERN_QUARTZCORE
-    // Distribute opacity either to our own layer or to our children. We pass in the 
-    // contribution from our parent(s).
-    distributeOpacity(parent() ? parent()->accumulatedOpacity() : 1);
-#else
     primaryLayer()->setOpacity(m_opacity);
 
@@ -2507 +2450 @@
         
     }
-#endif
 }
 

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

@@ -199 +199 @@
 
     CompositingCoordinatesOrientation defaultContentsOrientation() const;
-    void updateContentsTransform();
     
     void setupContentsLayer(PlatformCALayer*);