<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[205881] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/205881">205881</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-09-13 14:56:55 -0700 (Tue, 13 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPointh">trunk/Source/WebCore/platform/graphics/FloatPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRecth">trunk/Source/WebCore/platform/graphics/FloatRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatSizeh">trunk/Source/WebCore/platform/graphics/FloatSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntPointh">trunk/Source/WebCore/platform/graphics/IntPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntRecth">trunk/Source/WebCore/platform/graphics/IntRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsIntSizeh">trunk/Source/WebCore/platform/graphics/IntSize.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsAffineTransformh">trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixh">trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205880 => 205881)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-09-13 Brent Fulgham <bfulgham@apple.com>
+
+ [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:
+
</ins><span class="cx"> 2016-09-13 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of the m_premultiplyAlpha flag of the ImageFrame class
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.h (205880 => 205881)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2005 Nokia. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -48,7 +48,8 @@
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>-#include <d2d1.h>
</del><ins>+struct D2D_POINT_2F;
+typedef D2D_POINT_2F D2D1_POINT_2F;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -153,8 +154,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>- WEBCORE_EXPORT FloatPoint(const D2D_POINT_2F&);
- WEBCORE_EXPORT operator D2D_POINT_2F() const;
</del><ins>+ WEBCORE_EXPORT FloatPoint(const D2D1_POINT_2F&);
+ WEBCORE_EXPORT operator D2D1_POINT_2F() const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT FloatPoint matrixTransform(const TransformationMatrix&) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (205880 => 205881)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2003, 2006, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2003-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2005 Nokia. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -46,7 +46,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>-#include <d2d1.h>
</del><ins>+struct D2D_RECT_F;
+typedef D2D_RECT_F D2D1_RECT_F;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatSize.h (205880 => 205881)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2003, 2006 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2003-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2005 Nokia. All rights reserved.
</span><span class="cx"> * 2008 Eric Seidel <eric@webkit.org>
</span><span class="cx"> *
</span><span class="lines">@@ -48,7 +48,8 @@
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>-#include <d2d1.h>
</del><ins>+struct D2D_SIZE_F;
+typedef D2D_SIZE_F D2D1_SIZE_F;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntPoint.h (205880 => 205881)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,10 +33,6 @@
</span><span class="cx"> #import <Foundation/NSGeometry.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(WIN)
-#include <d2d1.h>
-#endif
-
</del><span class="cx"> #if USE(CG)
</span><span class="cx"> typedef struct CGPoint CGPoint;
</span><span class="cx"> #endif
</span><span class="lines">@@ -55,6 +51,12 @@
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> typedef struct tagPOINT POINT;
</span><span class="cx"> typedef struct tagPOINTS POINTS;
</span><ins>+
+struct D2D_POINT_2U;
+typedef D2D_POINT_2U D2D1_POINT_2U;
+
+struct D2D_POINT_2F;
+typedef D2D_POINT_2F D2D1_POINT_2F;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntRect.h (205880 => 205881)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,10 +29,6 @@
</span><span class="cx"> #include "IntPoint.h"
</span><span class="cx"> #include "LayoutUnit.h"
</span><span class="cx">
</span><del>-#if PLATFORM(WIN)
-#include <d2d1.h>
-#endif
-
</del><span class="cx"> #if USE(CG)
</span><span class="cx"> typedef struct CGRect CGRect;
</span><span class="cx"> #endif
</span><span class="lines">@@ -53,6 +49,12 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> typedef struct tagRECT RECT;
</span><ins>+
+struct D2D_RECT_U;
+typedef D2D_RECT_U D2D1_RECT_U;
+
+struct D2D_RECT_F;
+typedef D2D_RECT_F D2D1_RECT_F;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(CAIRO)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsIntSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/IntSize.h (205880 => 205881)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2003, 2004, 2005, 2006 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2003-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -33,10 +33,6 @@
</span><span class="cx"> #import <Foundation/NSGeometry.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(WIN)
-#include <d2d1.h>
-#endif
-
</del><span class="cx"> #if USE(CG)
</span><span class="cx"> typedef struct CGSize CGSize;
</span><span class="cx"> #endif
</span><span class="lines">@@ -57,6 +53,12 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> typedef struct tagSIZE SIZE;
</span><ins>+
+struct D2D_SIZE_U;
+typedef D2D_SIZE_U D2D1_SIZE_U;
+
+struct D2D_SIZE_F;
+typedef D2D_SIZE_F D2D1_SIZE_F;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsAffineTransformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h (205880 => 205881)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>-typedef struct D2D_MATRIX_3X2_F D2D_MATRIX_3X2_F;
</del><ins>+struct D2D_MATRIX_3X2_F;
</ins><span class="cx"> typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTransformationMatrixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TransformationMatrix.h (205880 => 205881)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2005, 2006 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>-typedef struct D2D_MATRIX_3X2_F D2D_MATRIX_3X2_F;
</del><ins>+struct D2D_MATRIX_3X2_F;
</ins><span class="cx"> typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>