Changeset 228322 in webkit

Timestamp:

Feb 9, 2018, 9:26:47 AM (9 years ago)

Author:

pvollan@apple.com

Message:

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

• WebView/WebWindowAnimation.mm:

(-[WebWindowScaleAnimation additionalDurationNeededToReachFinalFrame]):

Location:

trunk/Source/WebKitLegacy/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebWindowAnimation.mm (modified) (1 diff)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2018-02-09  Per Arne Vollan  <pvollan@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  <pvollan@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebWindowAnimation.mm

@@ -211 +211 @@
         maxDist = dist;
     
-    return std::min(sqrt(maxDist) * speedFactor, maxAdditionalDuration);
+    return std::min(static_cast<CGFloat>(sqrt(maxDist) * speedFactor), maxAdditionalDuration);
 }