Modified: branches/safari-600.1.17-branch/Source/WebCore/ChangeLog (179937 => 179938)
--- branches/safari-600.1.17-branch/Source/WebCore/ChangeLog 2015-02-11 18:36:38 UTC (rev 179937)
+++ branches/safari-600.1.17-branch/Source/WebCore/ChangeLog 2015-02-11 18:42:37 UTC (rev 179938)
@@ -1,3 +1,17 @@
+2015-02-11 Lucas Forschler <[email protected]>
+
+ Merge r174295
+
+ 2014-10-03 Brent Fulgham <[email protected]>
+
+ [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 <[email protected]>
Merge r176896.
Modified: branches/safari-600.1.17-branch/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp (179937 => 179938)
--- branches/safari-600.1.17-branch/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp 2015-02-11 18:36:38 UTC (rev 179937)
+++ branches/safari-600.1.17-branch/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp 2015-02-11 18:42:37 UTC (rev 179938)
@@ -37,15 +37,27 @@
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 } }
{
}
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()
{
