Title: [174295] trunk/Source/WebCore
Revision
174295
Author
bfulg...@apple.com
Date
2014-10-03 15:03:59 -0700 (Fri, 03 Oct 2014)

Log Message

[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.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (174294 => 174295)


--- trunk/Source/WebCore/ChangeLog	2014-10-03 21:46:14 UTC (rev 174294)
+++ trunk/Source/WebCore/ChangeLog	2014-10-03 22:03:59 UTC (rev 174295)
@@ -1,3 +1,13 @@
+2014-10-03  Brent Fulgham  <bfulg...@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-10-03  Tim Horton  <timothy_hor...@apple.com>
 
         WKWebView snapshot of Daring Fireball has the wrong color in the obscured inset

Modified: trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp (174294 => 174295)


--- trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp	2014-10-03 21:46:14 UTC (rev 174294)
+++ trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.cpp	2014-10-03 22:03:59 UTC (rev 174295)
@@ -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()
 {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to