<!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>[207487] 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/207487">207487</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-10-18 13:55:49 -0700 (Tue, 18 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add preliminary support for extended colors to WebCore::Color
https://bugs.webkit.org/show_bug.cgi?id=162878
<rdar://problem/28596413>
Follow-up review comments from Darin Adler.
* html/canvas/CanvasGradient.cpp:
(WebCore::CanvasGradient::addColorStop): Use nullptr.
* platform/graphics/Color.cpp:
(WebCore::Color::Color): Explicitly zero before assigning the pointer.
* platform/graphics/Color.h: Add some comments about the failings of operator== and hash.
(WebCore::Color::Color): Add some static_asserts to the constructors. Move the empty and deleted values
to static constants.
(WebCore::Color::isHashTableDeletedValue):
(WebCore::Color::hash): Replacement for asUint64, which was only being used for a hash.
(WebCore::Color::asUint64): Deleted.
* platform/graphics/ColorHash.h: Use new hash functions. Use "using" instead of typedef.
(WTF::ColorHash::hash):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasGradientcpp">trunk/Source/WebCore/html/canvas/CanvasGradient.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorcpp">trunk/Source/WebCore/platform/graphics/Color.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorh">trunk/Source/WebCore/platform/graphics/Color.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorHashh">trunk/Source/WebCore/platform/graphics/ColorHash.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207486 => 207487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-18 20:40:03 UTC (rev 207486)
+++ trunk/Source/WebCore/ChangeLog 2016-10-18 20:55:49 UTC (rev 207487)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-10-18 Dean Jackson <dino@apple.com>
+
+ Add preliminary support for extended colors to WebCore::Color
+ https://bugs.webkit.org/show_bug.cgi?id=162878
+ <rdar://problem/28596413>
+
+ Follow-up review comments from Darin Adler.
+
+ * html/canvas/CanvasGradient.cpp:
+ (WebCore::CanvasGradient::addColorStop): Use nullptr.
+ * platform/graphics/Color.cpp:
+ (WebCore::Color::Color): Explicitly zero before assigning the pointer.
+ * platform/graphics/Color.h: Add some comments about the failings of operator== and hash.
+ (WebCore::Color::Color): Add some static_asserts to the constructors. Move the empty and deleted values
+ to static constants.
+ (WebCore::Color::isHashTableDeletedValue):
+ (WebCore::Color::hash): Replacement for asUint64, which was only being used for a hash.
+ (WebCore::Color::asUint64): Deleted.
+ * platform/graphics/ColorHash.h: Use new hash functions. Use "using" instead of typedef.
+ (WTF::ColorHash::hash):
+
</ins><span class="cx"> 2016-10-18 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r201471): Keyboard remains visible when swiping back on twitter.com
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasGradientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasGradient.cpp (207486 => 207487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasGradient.cpp 2016-10-18 20:40:03 UTC (rev 207486)
+++ trunk/Source/WebCore/html/canvas/CanvasGradient.cpp 2016-10-18 20:55:49 UTC (rev 207487)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Color color = parseColorOrCurrentColor(colorString, 0 /*canvas*/);
</del><ins>+ Color color = parseColorOrCurrentColor(colorString, nullptr /*canvas*/);
</ins><span class="cx"> if (!color.isValid()) {
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> if (!m_dashboardCompatibilityMode)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.cpp (207486 => 207487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.cpp 2016-10-18 20:40:03 UTC (rev 207486)
+++ trunk/Source/WebCore/platform/graphics/Color.cpp 2016-10-18 20:55:49 UTC (rev 207487)
</span><span class="lines">@@ -289,6 +289,9 @@
</span><span class="cx">
</span><span class="cx"> Color::Color(float r, float g, float b, float a, ColorSpace colorSpace)
</span><span class="cx"> {
</span><ins>+ // Zero the union, just in case a 32-bit system only assigns the
+ // top 32 bits when copying the extendedColor pointer below.
+ m_colorData.rgbaAndFlags = 0;
</ins><span class="cx"> auto extendedColorRef = ExtendedColor::create(r, g, b, a, colorSpace);
</span><span class="cx"> m_colorData.extendedColor = &extendedColorRef.leakRef();
</span><span class="cx"> ASSERT(isExtended());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.h (207486 => 207487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.h 2016-10-18 20:40:03 UTC (rev 207486)
+++ trunk/Source/WebCore/platform/graphics/Color.h 2016-10-18 20:55:49 UTC (rev 207487)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <cmath>
</span><span class="cx"> #include <unicode/uchar.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/HashFunctions.h>
</ins><span class="cx"> #include <wtf/Optional.h>
</span><span class="cx"> #include <wtf/text/LChar.h>
</span><span class="cx">
</span><span class="lines">@@ -143,18 +144,23 @@
</span><span class="cx">
</span><span class="cx"> explicit Color(WTF::HashTableDeletedValueType)
</span><span class="cx"> {
</span><del>- m_colorData.rgbaAndFlags = 0xfffffffffffffffd;
</del><ins>+ static_assert(deletedHashValue & invalidRGBAColor, "Color's deleted hash value must not look like an ExtendedColor");
+ static_assert(!(deletedHashValue & validRGBAColorBit), "Color's deleted hash value must not look like a valid RGBA32 Color");
+ static_assert(deletedHashValue & (1 << 4), "Color's deleted hash value must have some bits set that an RGBA32 Color wouldn't have");
+ m_colorData.rgbaAndFlags = deletedHashValue;
</ins><span class="cx"> ASSERT(!isExtended());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isHashTableDeletedValue() const
</span><span class="cx"> {
</span><del>- return m_colorData.rgbaAndFlags == 0xfffffffffffffffd;
</del><ins>+ return m_colorData.rgbaAndFlags == deletedHashValue;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> explicit Color(WTF::HashTableEmptyValueType)
</span><span class="cx"> {
</span><del>- m_colorData.rgbaAndFlags = 0xffffffffffffffb;
</del><ins>+ static_assert(emptyHashValue & invalidRGBAColor, "Color's empty hash value must not look like an ExtendedColor");
+ static_assert(emptyHashValue & (1 << 4), "Color's deleted hash value must have some bits set that an RGBA32 Color wouldn't have");
+ m_colorData.rgbaAndFlags = emptyHashValue;
</ins><span class="cx"> ASSERT(!isExtended());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -200,8 +206,11 @@
</span><span class="cx"> int alpha() const { return alphaChannel(rgb()); }
</span><span class="cx">
</span><span class="cx"> RGBA32 rgb() const { ASSERT(!isExtended()); return static_cast<RGBA32>(m_colorData.rgbaAndFlags >> 32); }
</span><del>- uint64_t asUint64() const { return m_colorData.rgbaAndFlags; }
</del><span class="cx">
</span><ins>+ // FIXME: Like operator==, this will give different values for ExtendedColors that
+ // should be identical, since the respective pointer will be different.
+ unsigned hash() const { return WTF::intHash(m_colorData.rgbaAndFlags); }
+
</ins><span class="cx"> WEBCORE_EXPORT void getRGBA(float& r, float& g, float& b, float& a) const;
</span><span class="cx"> WEBCORE_EXPORT void getRGBA(double& r, double& g, double& b, double& a) const;
</span><span class="cx"> WEBCORE_EXPORT void getHSL(double& h, double& s, double& l) const;
</span><span class="lines">@@ -274,6 +283,9 @@
</span><span class="cx"> static const uint64_t validRGBAColorBit = 0x2;
</span><span class="cx"> static const uint64_t validRGBAColor = 0x3;
</span><span class="cx">
</span><ins>+ static const uint64_t deletedHashValue = 0xFFFFFFFFFFFFFFFD;
+ static const uint64_t emptyHashValue = 0xFFFFFFFFFFFFFFFB;
+
</ins><span class="cx"> WEBCORE_EXPORT void tagAsValid();
</span><span class="cx">
</span><span class="cx"> union {
</span><span class="lines">@@ -282,6 +294,8 @@
</span><span class="cx"> } m_colorData;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+// FIXME: These do not work for ExtendedColor because
+// they become just pointer comparison.
</ins><span class="cx"> bool operator==(const Color&, const Color&);
</span><span class="cx"> bool operator!=(const Color&, const Color&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorHashh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ColorHash.h (207486 => 207487)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ColorHash.h 2016-10-18 20:40:03 UTC (rev 207486)
+++ trunk/Source/WebCore/platform/graphics/ColorHash.h 2016-10-18 20:55:49 UTC (rev 207487)
</span><span class="lines">@@ -31,13 +31,13 @@
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> struct ColorHash {
</span><del>- static unsigned hash(const WebCore::Color& key) { return intHash(key.asUint64()); }
</del><ins>+ static unsigned hash(const WebCore::Color& key) { return key.hash(); }
</ins><span class="cx"> static bool equal(const WebCore::Color& a, const WebCore::Color& b) { return a == b; }
</span><span class="cx"> static const bool safeToCompareToEmptyOrDeleted = true;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct DefaultHash<WebCore::Color> {
</span><del>- typedef ColorHash Hash;
</del><ins>+ using Hash = ColorHash;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<> struct HashTraits<WebCore::Color> : GenericHashTraits<WebCore::Color> {
</span></span></pre>
</div>
</div>
</body>
</html>