Changeset 243680 in webkit

Timestamp:

Mar 30, 2019, 10:50:37 AM (7 years ago)

Author:

Antti Koivisto

Message:

Try to fix Windows build.

• platform/graphics/RoundedRect.cpp:

(WebCore::approximateAsRegion):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/RoundedRect.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-03-30  Antti Koivisto  <antti@apple.com>
+
+        Try to fix Windows build.
+
+        * platform/graphics/RoundedRect.cpp:
+        (WebCore::approximateAsRegion):
+
 2019-03-30  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/platform/graphics/RoundedRect.cpp

@@ -34 +34 @@
 #include "LayoutUnit.h"
 #include "Region.h"
-
 #include <algorithm>
-#include <math.h>
+#include <wtf/MathExtras.h>
 
 namespace WebCore {
@@ -328 +327 @@
 
     auto subtractCornerRects = [&] (LayoutPoint corner, LayoutPoint ellipsisCenter, LayoutSize axes, double fromAngle) {
-        double toAngle = fromAngle + M_PI / 2;
+        double toAngle = fromAngle + piDouble / 2;
 
         // Substract more rects for longer, more rounded arcs.
@@ -353 +352 @@
         auto axes = radii.bottomLeft();
         auto ellipsisCenter = LayoutPoint(corner.x() + axes.width(), corner.y() - axes.height());
-        subtractCornerRects(corner, ellipsisCenter, axes, M_PI / 2);
+        subtractCornerRects(corner, ellipsisCenter, axes, piDouble / 2);
     }
 
@@ -360 +359 @@
         auto axes = radii.topLeft();
         auto ellipsisCenter = LayoutPoint(corner.x() + axes.width(), corner.y() + axes.height());
-        subtractCornerRects(corner, ellipsisCenter, axes, M_PI);
+        subtractCornerRects(corner, ellipsisCenter, axes, piDouble);
     }
 
@@ -367 +366 @@
         auto axes = radii.topRight();
         auto ellipsisCenter = LayoutPoint(corner.x() - axes.width(), corner.y() + axes.height());
-        subtractCornerRects(corner, ellipsisCenter, axes, M_PI * 3 / 2);
+        subtractCornerRects(corner, ellipsisCenter, axes, piDouble * 3 / 2);
     }