diff options
Diffstat (limited to 'WebCore/platform/graphics/mac/GraphicsLayerCA.mm')
-rw-r--r-- | WebCore/platform/graphics/mac/GraphicsLayerCA.mm | 62 |
1 files changed, 1 insertions, 61 deletions
diff --git a/WebCore/platform/graphics/mac/GraphicsLayerCA.mm b/WebCore/platform/graphics/mac/GraphicsLayerCA.mm index 5fedaff..395a691 100644 --- a/WebCore/platform/graphics/mac/GraphicsLayerCA.mm +++ b/WebCore/platform/graphics/mac/GraphicsLayerCA.mm @@ -263,15 +263,6 @@ static String animationIdentifier(AnimatedPropertyID property, const String& key return builder.toString(); } -#if !HAVE_MODERN_QUARTZCORE -static TransformationMatrix flipTransform() -{ - TransformationMatrix flipper; - flipper.flipY(); - return flipper; -} -#endif - static CAMediaTimingFunction* getCAMediaTimingFunction(const TimingFunction* timingFunction) { // By this point, timing functions can only be linear or cubic, not steps. @@ -332,11 +323,6 @@ static bool forceSoftwareAnimation() return forceSoftwareAnimation; } -GraphicsLayer::CompositingCoordinatesOrientation GraphicsLayer::compositingCoordinatesOrientation() -{ - return CompositingCoordinatesBottomUp; -} - static NSDictionary* nullActionsDictionary() { NSNull* nullValue = [NSNull null]; @@ -831,28 +817,6 @@ void GraphicsLayerCA::setContentsToMedia(PlatformLayer* mediaLayer) noteLayerPropertyChanged(ContentsMediaLayerChanged); } -void GraphicsLayerCA::setGeometryOrientation(CompositingCoordinatesOrientation orientation) -{ - if (orientation == m_geometryOrientation) - return; - - GraphicsLayer::setGeometryOrientation(orientation); - noteLayerPropertyChanged(GeometryOrientationChanged); - -#if !HAVE_MODERN_QUARTZCORE - // Geometry orientation is mapped onto children transform in older QuartzCores. - switch (m_geometryOrientation) { - case CompositingCoordinatesTopDown: - setChildrenTransform(TransformationMatrix()); - break; - - case CompositingCoordinatesBottomUp: - setChildrenTransform(flipTransform()); - break; - } -#endif -} - void GraphicsLayerCA::didDisplay(PlatformLayer* layer) { CALayer* sourceLayer; @@ -984,9 +948,6 @@ void GraphicsLayerCA::commitLayerChangesBeforeSublayers() if (m_uncommittedChanges & ContentsRectChanged) updateContentsRect(); - if (m_uncommittedChanges & GeometryOrientationChanged) - updateGeometryOrientation(); - if (m_uncommittedChanges & MaskLayerChanged) updateMaskLayer(); @@ -1461,23 +1422,6 @@ void GraphicsLayerCA::updateContentsRect() } } -void GraphicsLayerCA::updateGeometryOrientation() -{ -#if HAVE_MODERN_QUARTZCORE - switch (geometryOrientation()) { - case CompositingCoordinatesTopDown: - [m_layer.get() setGeometryFlipped:NO]; - break; - - case CompositingCoordinatesBottomUp: - [m_layer.get() setGeometryFlipped:YES]; - break; - } - // Geometry orientation is mapped onto children transform in older QuartzCores, - // so is handled via setGeometryOrientation(). -#endif -} - void GraphicsLayerCA::updateMaskLayer() { CALayer *maskCALayer = m_maskLayer ? m_maskLayer->platformLayer() : 0; @@ -2226,11 +2170,7 @@ void GraphicsLayerCA::swapFromOrToTiledLayer(bool useTiledLayer) [tiledLayer setTileSize:tileSize]; [tiledLayer setLevelsOfDetail:1]; [tiledLayer setLevelsOfDetailBias:0]; - - if (GraphicsLayer::compositingCoordinatesOrientation() == GraphicsLayer::CompositingCoordinatesBottomUp) - [tiledLayer setContentsGravity:@"bottomLeft"]; - else - [tiledLayer setContentsGravity:@"topLeft"]; + [tiledLayer setContentsGravity:@"bottomLeft"]; #if !HAVE_MODERN_QUARTZCORE // Tiled layer has issues with flipped coordinates. |