Title: [122998] trunk/Source/WebKit/chromium
- Revision
- 122998
- Author
- [email protected]
- Date
- 2012-07-18 12:23:19 -0700 (Wed, 18 Jul 2012)
Log Message
[chromium] Unreviewed compile fix for Android.
More sqrt fixes.
* tests/CCLayerTreeHostCommonTest.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (122997 => 122998)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-18 18:55:32 UTC (rev 122997)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-18 19:23:19 UTC (rev 122998)
@@ -1,6 +1,14 @@
2012-07-18 Tony Chang <[email protected]>
[chromium] Unreviewed compile fix for Android.
+
+ More sqrt fixes.
+
+ * tests/CCLayerTreeHostCommonTest.cpp:
+
+2012-07-18 Tony Chang <[email protected]>
+
+ [chromium] Unreviewed compile fix for Android.
Source/WebKit/chromium/tests/CCDamageTrackerTest.cpp: In member function 'virtual void<unnamed>::CCDamageTrackerTest_verifyDamageForTransformedLayer_Test::TestBody()':
Source/WebKit/chromium/tests/CCDamageTrackerTest.cpp:332: error: call of overloaded 'sqrt(int)' is ambiguous
Modified: trunk/Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp (122997 => 122998)
--- trunk/Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp 2012-07-18 18:55:32 UTC (rev 122997)
+++ trunk/Source/WebKit/chromium/tests/CCLayerTreeHostCommonTest.cpp 2012-07-18 19:23:19 UTC (rev 122998)
@@ -2394,7 +2394,7 @@
// overlaps the right side of the layer. The visible rect should be the
// layer's right half.
layerToSurfaceTransform.makeIdentity();
- layerToSurfaceTransform.translate(0, -sqrt(2) * 15);
+ layerToSurfaceTransform.translate(0, -sqrt(2.0) * 15);
layerToSurfaceTransform.rotate(45);
expected = IntRect(IntPoint(15, 0), IntSize(15, 30)); // right half of layer bounds.
actual = CCLayerTreeHostCommon::calculateVisibleRect(targetSurfaceRect, layerContentRect, layerToSurfaceTransform);
@@ -2419,7 +2419,7 @@
// Case 2: Orthographic projection of a layer rotated about y-axis by 45 degrees, but
// shifted to the side so only the right-half the layer would be visible on
// the surface.
- double halfWidthOfRotatedLayer = (100 / sqrt(2)) * 0.5; // 100 is the un-rotated layer width; divided by sqrt(2) is the rotated width.
+ double halfWidthOfRotatedLayer = (100 / sqrt(2.0)) * 0.5; // 100 is the un-rotated layer width; divided by sqrt(2) is the rotated width.
layerToSurfaceTransform.makeIdentity();
layerToSurfaceTransform.translate(-halfWidthOfRotatedLayer, 0);
layerToSurfaceTransform.rotate3d(0, 45, 0); // rotates about the left edge of the layer
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
