<!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>[206056] 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/206056">206056</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-09-16 17:14:16 -0700 (Fri, 16 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win][Direct2D] Provide Color support for Direct2D
https://bugs.webkit.org/show_bug.cgi?id=162090
Reviewed by Dean Jackson.
Add casting operations to the Color class to allow easy interoption with
native Direct2D operations.
No new tests. No change in behavior.
* PlatformWin.cmake: Add new Windows implementation file.
* platform/graphics/Color.h:
* platform/graphics/win/ColorDirect2D.cpp: Added.
(WebCore::Color::Color):
(WebCore::Color::operator D2D1_COLOR_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorh">trunk/Source/WebCore/platform/graphics/Color.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicswinColorDirect2Dcpp">trunk/Source/WebCore/platform/graphics/win/ColorDirect2D.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206055 => 206056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-16 23:33:33 UTC (rev 206055)
+++ trunk/Source/WebCore/ChangeLog 2016-09-17 00:14:16 UTC (rev 206056)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-09-16 Brent Fulgham <bfulgham@apple.com>
+
+ [Win][Direct2D] Provide Color support for Direct2D
+ https://bugs.webkit.org/show_bug.cgi?id=162090
+
+ Reviewed by Dean Jackson.
+
+ Add casting operations to the Color class to allow easy interoption with
+ native Direct2D operations.
+
+ No new tests. No change in behavior.
+
+ * PlatformWin.cmake: Add new Windows implementation file.
+ * platform/graphics/Color.h:
+ * platform/graphics/win/ColorDirect2D.cpp: Added.
+ (WebCore::Color::Color):
+ (WebCore::Color::operator D2D1_COLOR_F):
+
</ins><span class="cx"> 2016-09-16 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Add size assert for RenderElement
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (206055 => 206056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake 2016-09-16 23:33:33 UTC (rev 206055)
+++ trunk/Source/WebCore/PlatformWin.cmake 2016-09-17 00:14:16 UTC (rev 206056)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx">
</span><span class="cx"> platform/graphics/opentype/OpenTypeUtilities.cpp
</span><span class="cx">
</span><ins>+ platform/graphics/win/ColorDirect2D.cpp
</ins><span class="cx"> platform/graphics/win/DIBPixelData.cpp
</span><span class="cx"> platform/graphics/win/FloatPointDirect2D.cpp
</span><span class="cx"> platform/graphics/win/FloatRectDirect2D.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.h (206055 => 206056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.h 2016-09-16 23:33:33 UTC (rev 206055)
+++ trunk/Source/WebCore/platform/graphics/Color.h 2016-09-17 00:14:16 UTC (rev 206056)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2003-2006, 2010, 2015 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">@@ -39,6 +39,13 @@
</span><span class="cx"> typedef struct CGColor* CGColorRef;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(WIN)
+struct _D3DCOLORVALUE;
+typedef _D3DCOLORVALUE D3DCOLORVALUE;
+typedef D3DCOLORVALUE D2D_COLOR_F;
+typedef D2D_COLOR_F D2D1_COLOR_F;
+#endif
+
</ins><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> typedef struct _GdkColor GdkColor;
</span><span class="cx"> #ifndef GTK_API_VERSION_2
</span><span class="lines">@@ -174,6 +181,11 @@
</span><span class="cx"> WEBCORE_EXPORT Color(CGColorRef);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(WIN)
+ WEBCORE_EXPORT Color(D2D1_COLOR_F);
+ WEBCORE_EXPORT operator D2D1_COLOR_F() const;
+#endif
+
</ins><span class="cx"> static bool parseHexColor(const String&, RGBA32&);
</span><span class="cx"> static bool parseHexColor(const StringView&, RGBA32&);
</span><span class="cx"> static bool parseHexColor(const LChar*, unsigned, RGBA32&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinColorDirect2Dcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/win/ColorDirect2D.cpp (0 => 206056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/ColorDirect2D.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/win/ColorDirect2D.cpp 2016-09-17 00:14:16 UTC (rev 206056)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+/*
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Color.h"
+
+#if PLATFORM(WIN)
+
+#include <d2d1.h>
+
+namespace WebCore {
+
+Color::Color(D2D1_COLOR_F color)
+{
+ m_color = makeRGBA(color.r * 255, color.g * 255, color.b * 255, color.a * 255);
+ m_valid = true;
+}
+
+Color::operator D2D1_COLOR_F() const
+{
+ float colorAlpha = alpha() / 255.0f;
+
+ return D2D1::ColorF(rgb(), colorAlpha);
+}
+
+}
+
+#endif // PLATFORM(WIN)
</ins></span></pre>
</div>
</div>
</body>
</html>