[webkit-changes] [99000] tags/Safari-535.7.1/Source/WebCore

[lforschler]

Title: [99000] tags/Safari-535.7.1/Source/WebCore

Revision

99000

Author

lforsch...@apple.com

Date

2011-11-01 14:50:01 -0700 (Tue, 01 Nov 2011)

Log Message

Merged r98824.

Modified Paths

tags/Safari-535.7.1/Source/WebCore/ChangeLog
tags/Safari-535.7.1/Source/WebCore/platform/graphics/mac/WebLayer.mm

Diff

Modified: tags/Safari-535.7.1/Source/WebCore/ChangeLog (98999 => 99000)

--- tags/Safari-535.7.1/Source/WebCore/ChangeLog	2011-11-01 21:45:35 UTC (rev 98999)
+++ tags/Safari-535.7.1/Source/WebCore/ChangeLog	2011-11-01 21:50:01 UTC (rev 99000)
@@ -1,3 +1,14 @@
+2011-11-01  Lucas Forschler  <lforsch...@apple.com>
+
+    Merge 98824
+
+    2011-10-29  Mark Rowe  <mr...@apple.com>
+
+            Build fix.
+
+            * platform/graphics/mac/WebLayer.mm:
+            (drawLayerContents):
+
 2011-10-27  Mike Reed  <r...@google.com>
 
         [skia] replace offscreen technique with native support for antialiased clipping

Modified: tags/Safari-535.7.1/Source/WebCore/platform/graphics/mac/WebLayer.mm (98999 => 99000)

--- tags/Safari-535.7.1/Source/WebCore/platform/graphics/mac/WebLayer.mm	2011-11-01 21:45:35 UTC (rev 98999)
+++ tags/Safari-535.7.1/Source/WebCore/platform/graphics/mac/WebLayer.mm	2011-11-01 21:50:01 UTC (rev 99000)
@@ -92,7 +92,7 @@
         indicatorBox.size.height = 27;
         CGContextSaveGState(context);
         
-        CGContextSetAlpha(context, 0.5);
+        CGContextSetAlpha(context, 0.5f);
         CGContextBeginTransparencyLayerWithRect(context, indicatorBox, 0);
 
         if (isTiledLayer)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes