Changeset 179938 in webkit

Timestamp:

Feb 11, 2015, 10:42:37 AM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r174295.

Location:

branches/safari-600.1.17-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/transforms/AffineTransform.cpp (modified) (2 diffs)

branches/safari-600.1.17-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-11  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r174295
+
+    2014-10-03  Brent Fulgham  <bfulgham@apple.com>
+
+            [Win] Unreviewed build fix for MSVC 2013 SP 3.
+
+            The std::array initializer is not fully implemented in SP3 and causes a
+            build error.
+
+            * platform/graphics/transforms/AffineTransform.cpp: Use old style assignment
+            initialization for MSVC builds until this bug is fixed.
+
 2014-12-16  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-600.1.17-branch/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp

@@ -38 +38 @@
 namespace WebCore {
 
+#if COMPILER(MSVC)
+AffineTransform::AffineTransform()
+{
+    m_transform = { 1, 0, 0, 1, 0, 0 };
+}
+
+AffineTransform::AffineTransform(double a, double b, double c, double d, double e, double f)
+{
+    m_transform = { a, b, c, d, e, f };
+}
+#else
 AffineTransform::AffineTransform()
     : m_transform { { 1, 0, 0, 1, 0, 0 } }
@@ -44 +55 @@
 
 AffineTransform::AffineTransform(double a, double b, double c, double d, double e, double f)
-    : m_transform { { a, b, c, d, e, f } }
-{
-}
+    : m_transform{ { a, b, c, d, e, f } }
+{
+}
+#endif
 
 void AffineTransform::makeIdentity()