Diff
Modified: trunk/Source/WebCore/ChangeLog (205880 => 205881)
--- trunk/Source/WebCore/ChangeLog 2016-09-13 21:53:11 UTC (rev 205880)
+++ trunk/Source/WebCore/ChangeLog 2016-09-13 21:56:55 UTC (rev 205881)
@@ -1,3 +1,20 @@
+2016-09-13 Brent Fulgham <[email protected]>
+
+ [Win] Unreviewed build fix.
+
+ Based on a suggestion by Simon Fraser, I have corrected the
+ headers to avoid including <d2d1.h> directly, relying instead
+ on forward declarations.
+
+ * platform/graphics/FloatPoint.h:
+ * platform/graphics/FloatRect.h:
+ * platform/graphics/FloatSize.h:
+ * platform/graphics/IntPoint.h:
+ * platform/graphics/IntRect.h:
+ * platform/graphics/IntSize.h:
+ * platform/graphics/transforms/AffineTransform.h:
+ * platform/graphics/transforms/TransformationMatrix.h:
+
2016-09-13 Said Abou-Hallawa <[email protected]>
Get rid of the m_premultiplyAlpha flag of the ImageFrame class
Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.h (205880 => 205881)
--- trunk/Source/WebCore/platform/graphics/FloatPoint.h 2016-09-13 21:53:11 UTC (rev 205880)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint.h 2016-09-13 21:56:55 UTC (rev 205881)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2016 Apple Inc. All rights reserved.
* Copyright (C) 2005 Nokia. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,8 @@
#endif // PLATFORM(MAC)
#if PLATFORM(WIN)
-#include <d2d1.h>
+struct D2D_POINT_2F;
+typedef D2D_POINT_2F D2D1_POINT_2F;
#endif
namespace WebCore {
@@ -153,8 +154,8 @@
#endif
#if PLATFORM(WIN)
- WEBCORE_EXPORT FloatPoint(const D2D_POINT_2F&);
- WEBCORE_EXPORT operator D2D_POINT_2F() const;
+ WEBCORE_EXPORT FloatPoint(const D2D1_POINT_2F&);
+ WEBCORE_EXPORT operator D2D1_POINT_2F() const;
#endif
WEBCORE_EXPORT FloatPoint matrixTransform(const TransformationMatrix&) const;
Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (205880 => 205881)
--- trunk/Source/WebCore/platform/graphics/FloatRect.h 2016-09-13 21:53:11 UTC (rev 205880)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.h 2016-09-13 21:56:55 UTC (rev 205881)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2016 Apple Inc. All rights reserved.
* Copyright (C) 2005 Nokia. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,8 @@
#endif
#if PLATFORM(WIN)
-#include <d2d1.h>
+struct D2D_RECT_F;
+typedef D2D_RECT_F D2D1_RECT_F;
#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (205880 => 205881)
--- trunk/Source/WebCore/platform/graphics/FloatSize.h 2016-09-13 21:53:11 UTC (rev 205880)
+++ trunk/Source/WebCore/platform/graphics/FloatSize.h 2016-09-13 21:56:55 UTC (rev 205881)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2006 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2016 Apple Inc. All rights reserved.
* Copyright (C) 2005 Nokia. All rights reserved.
* 2008 Eric Seidel <[email protected]>
*
@@ -48,7 +48,8 @@
#endif // PLATFORM(MAC)
#if PLATFORM(WIN)
-#include <d2d1.h>
+struct D2D_SIZE_F;
+typedef D2D_SIZE_F D2D1_SIZE_F;
#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/IntPoint.h (205880 => 205881)
--- trunk/Source/WebCore/platform/graphics/IntPoint.h 2016-09-13 21:53:11 UTC (rev 205880)
+++ trunk/Source/WebCore/platform/graphics/IntPoint.h 2016-09-13 21:56:55 UTC (rev 205881)
@@ -33,10 +33,6 @@
#import <Foundation/NSGeometry.h>
#endif
-#if PLATFORM(WIN)
-#include <d2d1.h>
-#endif
-
#if USE(CG)
typedef struct CGPoint CGPoint;
#endif
@@ -55,6 +51,12 @@
#if PLATFORM(WIN)
typedef struct tagPOINT POINT;
typedef struct tagPOINTS POINTS;
+
+struct D2D_POINT_2U;
+typedef D2D_POINT_2U D2D1_POINT_2U;
+
+struct D2D_POINT_2F;
+typedef D2D_POINT_2F D2D1_POINT_2F;
#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (205880 => 205881)
--- trunk/Source/WebCore/platform/graphics/IntRect.h 2016-09-13 21:53:11 UTC (rev 205880)
+++ trunk/Source/WebCore/platform/graphics/IntRect.h 2016-09-13 21:56:55 UTC (rev 205881)
@@ -29,10 +29,6 @@
#include "IntPoint.h"
#include "LayoutUnit.h"
-#if PLATFORM(WIN)
-#include <d2d1.h>
-#endif
-
#if USE(CG)
typedef struct CGRect CGRect;
#endif
@@ -53,6 +49,12 @@
#if PLATFORM(WIN)
typedef struct tagRECT RECT;
+
+struct D2D_RECT_U;
+typedef D2D_RECT_U D2D1_RECT_U;
+
+struct D2D_RECT_F;
+typedef D2D_RECT_F D2D1_RECT_F;
#endif
#if USE(CAIRO)
Modified: trunk/Source/WebCore/platform/graphics/IntSize.h (205880 => 205881)
--- trunk/Source/WebCore/platform/graphics/IntSize.h 2016-09-13 21:53:11 UTC (rev 205880)
+++ trunk/Source/WebCore/platform/graphics/IntSize.h 2016-09-13 21:56:55 UTC (rev 205881)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2004, 2005, 2006 Apple Inc. All rights reserved.
+ * Copyright (C) 2003-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,10 +33,6 @@
#import <Foundation/NSGeometry.h>
#endif
-#if PLATFORM(WIN)
-#include <d2d1.h>
-#endif
-
#if USE(CG)
typedef struct CGSize CGSize;
#endif
@@ -57,6 +53,12 @@
#if PLATFORM(WIN)
typedef struct tagSIZE SIZE;
+
+struct D2D_SIZE_U;
+typedef D2D_SIZE_U D2D1_SIZE_U;
+
+struct D2D_SIZE_F;
+typedef D2D_SIZE_F D2D1_SIZE_F;
#endif
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h (205880 => 205881)
--- trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2016-09-13 21:53:11 UTC (rev 205880)
+++ trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h 2016-09-13 21:56:55 UTC (rev 205881)
@@ -39,7 +39,7 @@
#endif
#if PLATFORM(WIN)
-typedef struct D2D_MATRIX_3X2_F D2D_MATRIX_3X2_F;
+struct D2D_MATRIX_3X2_F;
typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F;
#endif
Modified: trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h (205880 => 205881)
--- trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h 2016-09-13 21:53:11 UTC (rev 205880)
+++ trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h 2016-09-13 21:56:55 UTC (rev 205881)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005, 2006 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2016 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -51,7 +51,7 @@
#endif
#if PLATFORM(WIN)
-typedef struct D2D_MATRIX_3X2_F D2D_MATRIX_3X2_F;
+struct D2D_MATRIX_3X2_F;
typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F;
#endif
