Title: [107878] trunk/Source/WebCore
- Revision
- 107878
- Author
- [email protected]
- Date
- 2012-02-15 19:57:34 -0800 (Wed, 15 Feb 2012)
Log Message
Attempt to fix the Snow Leopard build.
* platform/graphics/ca/mac/TileCache.mm:
(WebCore::TileCache::createTileLayer):
* platform/graphics/ca/mac/WebTileCacheLayer.mm:
(-[WebTileCacheLayer setContentsScale:]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107877 => 107878)
--- trunk/Source/WebCore/ChangeLog 2012-02-16 03:57:05 UTC (rev 107877)
+++ trunk/Source/WebCore/ChangeLog 2012-02-16 03:57:34 UTC (rev 107878)
@@ -1,3 +1,12 @@
+2012-02-15 Anders Carlsson <[email protected]>
+
+ Attempt to fix the Snow Leopard build.
+
+ * platform/graphics/ca/mac/TileCache.mm:
+ (WebCore::TileCache::createTileLayer):
+ * platform/graphics/ca/mac/WebTileCacheLayer.mm:
+ (-[WebTileCacheLayer setContentsScale:]):
+
2012-02-15 Dan Bernstein <[email protected]>
REGRESSION (r107836): fast/box-shadow/spread.html and fast/writing-mode/box-shadow-*.html tests failing
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.mm (107877 => 107878)
--- trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.mm 2012-02-16 03:57:05 UTC (rev 107877)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/TileCache.mm 2012-02-16 03:57:34 UTC (rev 107878)
@@ -350,9 +350,9 @@
[layer.get() setBorderColor:m_tileDebugBorderColor.get()];
[layer.get() setBorderWidth:m_tileDebugBorderWidth];
[layer.get() setEdgeAntialiasingMask:0];
- [layer.get() setContentsScale:[m_tileCacheLayer contentsScale]];
#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+ [layer.get() setContentsScale:[m_tileCacheLayer contentsScale]];
[layer.get() setAcceleratesDrawing:m_acceleratesDrawing];
#endif
Modified: trunk/Source/WebCore/platform/graphics/ca/mac/WebTileCacheLayer.mm (107877 => 107878)
--- trunk/Source/WebCore/platform/graphics/ca/mac/WebTileCacheLayer.mm 2012-02-16 03:57:05 UTC (rev 107877)
+++ trunk/Source/WebCore/platform/graphics/ca/mac/WebTileCacheLayer.mm 2012-02-16 03:57:34 UTC (rev 107878)
@@ -87,12 +87,14 @@
- (void)setContentsScale:(CGFloat)contentsScale
{
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
CGFloat oldContentsScale = [self contentsScale];
[super setContentsScale:contentsScale];
if (contentsScale != oldContentsScale)
_tileCache->setContentsScale(contentsScale);
+#endif
}
- (CALayer *)tileContainerLayer
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
