Title: [228322] trunk/Source/WebKitLegacy/mac
Revision
228322
Author
pvol...@apple.com
Date
2018-02-09 09:26:47 -0800 (Fri, 09 Feb 2018)

Log Message

Unreviewed 32-bit build fix after <https://trac.webkit.org/changeset/228308>.

* WebView/WebWindowAnimation.mm:
(-[WebWindowScaleAnimation additionalDurationNeededToReachFinalFrame]):

Modified Paths

Diff

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (228321 => 228322)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2018-02-09 16:48:53 UTC (rev 228321)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2018-02-09 17:26:47 UTC (rev 228322)
@@ -1,3 +1,10 @@
+2018-02-09  Per Arne Vollan  <pvol...@apple.com>
+
+        Unreviewed 32-bit build fix after <https://trac.webkit.org/changeset/228308>.
+
+        * WebView/WebWindowAnimation.mm:
+        (-[WebWindowScaleAnimation additionalDurationNeededToReachFinalFrame]):
+
 2018-02-08  Per Arne Vollan  <pvol...@apple.com>
 
         Move WebVideoFullscreenController from WebCore to WebKitLegacy.

Modified: trunk/Source/WebKitLegacy/mac/WebView/WebWindowAnimation.mm (228321 => 228322)


--- trunk/Source/WebKitLegacy/mac/WebView/WebWindowAnimation.mm	2018-02-09 16:48:53 UTC (rev 228321)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebWindowAnimation.mm	2018-02-09 17:26:47 UTC (rev 228322)
@@ -210,7 +210,7 @@
     if (dist > maxDist)
         maxDist = dist;
     
-    return std::min(sqrt(maxDist) * speedFactor, maxAdditionalDuration);
+    return std::min(static_cast<CGFloat>(sqrt(maxDist) * speedFactor), maxAdditionalDuration);
 }
 
 - (void)startAnimation
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to