Title: [126981] trunk/Source/WebCore
Revision
126981
Author
commit-qu...@webkit.org
Date
2012-08-29 03:52:16 -0700 (Wed, 29 Aug 2012)

Log Message

[chromium] Use floating point literals in expressions that initialize floats
https://bugs.webkit.org/show_bug.cgi?id=95293

Patch by James Robinson <jam...@chromium.org> on 2012-08-29
Reviewed by Adam Barth.

Visual studio's C4305, which is on for some chromium code, complains about these.

* platform/graphics/chromium/cc/CCLayerSorter.cpp:
(WebCore::CCLayerSorter::createGraphEdges):
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::scrollBy):
(WebCore::CCLayerTreeHostImpl::computePinchZoomDeltas):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (126980 => 126981)


--- trunk/Source/WebCore/ChangeLog	2012-08-29 10:46:24 UTC (rev 126980)
+++ trunk/Source/WebCore/ChangeLog	2012-08-29 10:52:16 UTC (rev 126981)
@@ -1,3 +1,18 @@
+2012-08-29  James Robinson  <jam...@chromium.org>
+
+        [chromium] Use floating point literals in expressions that initialize floats
+        https://bugs.webkit.org/show_bug.cgi?id=95293
+
+        Reviewed by Adam Barth.
+
+        Visual studio's C4305, which is on for some chromium code, complains about these.
+
+        * platform/graphics/chromium/cc/CCLayerSorter.cpp:
+        (WebCore::CCLayerSorter::createGraphEdges):
+        * platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+        (WebCore::CCLayerTreeHostImpl::scrollBy):
+        (WebCore::CCLayerTreeHostImpl::computePinchZoomDeltas):
+
 2012-08-29  Vsevolod Vlasov  <vse...@chromium.org>
 
         Web Inspector: Extract StylesUISourceCodeProvider to separate file.

Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerSorter.cpp (126980 => 126981)


--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerSorter.cpp	2012-08-29 10:46:24 UTC (rev 126980)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerSorter.cpp	2012-08-29 10:52:16 UTC (rev 126981)
@@ -264,7 +264,7 @@
 #endif
     // Fraction of the total zRange below which z differences
     // are not considered reliable.
-    const float zThresholdFactor = 0.01;
+    const float zThresholdFactor = 0.01f;
     float zThreshold = m_zRange * zThresholdFactor;
 
     for (unsigned na = 0; na < m_nodes.size(); na++) {

Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp (126980 => 126981)


--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp	2012-08-29 10:46:24 UTC (rev 126980)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp	2012-08-29 10:52:16 UTC (rev 126981)
@@ -976,7 +976,7 @@
             appliedDelta = scrollLayerWithLocalDelta(*layerImpl, pendingDelta);
 
         // If the layer wasn't able to move, try the next one in the hierarchy.
-        float moveThresholdSquared = 0.1 * 0.1;
+        float moveThresholdSquared = 0.1f * 0.1f;
         if (appliedDelta.diagonalLengthSquared() < moveThresholdSquared)
             continue;
 
@@ -1078,7 +1078,7 @@
     // Only send fake scroll/zoom deltas if we're pinch zooming out by a
     // significant amount. This also ensures only one fake delta set will be
     // sent.
-    const float pinchZoomOutSensitivity = 0.95;
+    const float pinchZoomOutSensitivity = 0.95f;
     if (m_pageScaleDelta > pinchZoomOutSensitivity)
         return;
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to