<!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>[211853] 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/211853">211853</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-07 22:41:12 -0800 (Tue, 07 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Handle extended colors in cairo and texture mapper backends
https://bugs.webkit.org/show_bug.cgi?id=167943
Reviewed by Michael Catanzaro.
Fixes: css3/color/backgrounds-and-borders.html
css3/color/box-shadows.html
css3/color/canvas.html
css3/color/composited-solid-backgrounds.html
css3/color/text.html
* platform/graphics/Color.cpp:
(WebCore::premultipliedARGBFromColor): Handle the case of color being extended.
* platform/graphics/cairo/CairoUtilities.cpp:
(WebCore::setSourceRGBAFromColor): Ditto.
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::fillRectWithColor): Use isVisible() instead of alpha().
(WebCore::GraphicsContext::drawEllipse): Ditto.
* platform/graphics/gtk/ColorGtk.cpp:
(WebCore::Color::operator GdkRGBA): Handle the case of color being extended.
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGL::drawNumber): Ditto.
* platform/graphics/texmap/TextureMapperLayer.cpp:
(WebCore::blendWithOpacity): Ditto.
(WebCore::TextureMapperLayer::paintSelf): Use isVisible() instead of alpha().
(WebCore::TextureMapperLayer::computeOverlapRegions): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorcpp">trunk/Source/WebCore/platform/graphics/Color.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoCairoUtilitiescpp">trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp">trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgtkColorGtkcpp">trunk/Source/WebCore/platform/graphics/gtk/ColorGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp">trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211852 => 211853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-08 01:47:31 UTC (rev 211852)
+++ trunk/Source/WebCore/ChangeLog 2017-02-08 06:41:12 UTC (rev 211853)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2017-02-07 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Handle extended colors in cairo and texture mapper backends
+ https://bugs.webkit.org/show_bug.cgi?id=167943
+
+ Reviewed by Michael Catanzaro.
+
+ Fixes: css3/color/backgrounds-and-borders.html
+ css3/color/box-shadows.html
+ css3/color/canvas.html
+ css3/color/composited-solid-backgrounds.html
+ css3/color/text.html
+
+ * platform/graphics/Color.cpp:
+ (WebCore::premultipliedARGBFromColor): Handle the case of color being extended.
+ * platform/graphics/cairo/CairoUtilities.cpp:
+ (WebCore::setSourceRGBAFromColor): Ditto.
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::fillRectWithColor): Use isVisible() instead of alpha().
+ (WebCore::GraphicsContext::drawEllipse): Ditto.
+ * platform/graphics/gtk/ColorGtk.cpp:
+ (WebCore::Color::operator GdkRGBA): Handle the case of color being extended.
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::TextureMapperGL::drawNumber): Ditto.
+ * platform/graphics/texmap/TextureMapperLayer.cpp:
+ (WebCore::blendWithOpacity): Ditto.
+ (WebCore::TextureMapperLayer::paintSelf): Use isVisible() instead of alpha().
+ (WebCore::TextureMapperLayer::computeOverlapRegions): Ditto.
+
</ins><span class="cx"> 2017-02-07 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> WebItemProviderPasteboard should use -registerLoadHandlersToItemProvider: when creating a new UIItemProvider
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.cpp (211852 => 211853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.cpp 2017-02-08 01:47:31 UTC (rev 211852)
+++ trunk/Source/WebCore/platform/graphics/Color.cpp 2017-02-08 06:41:12 UTC (rev 211853)
</span><span class="lines">@@ -616,15 +616,16 @@
</span><span class="cx">
</span><span class="cx"> RGBA32 premultipliedARGBFromColor(const Color& color)
</span><span class="cx"> {
</span><del>- unsigned pixelColor;
</del><ins>+ if (color.isOpaque()) {
+ if (color.isExtended())
+ return makeRGB(color.asExtended().red() * 255, color.asExtended().green() * 255, color.asExtended().blue() * 255);
+ return color.rgb();
+ }
</ins><span class="cx">
</span><del>- unsigned alpha = color.alpha();
- if (alpha < 255)
- pixelColor = makePremultipliedRGBA(color.red(), color.green(), color.blue(), alpha);
- else
- pixelColor = color.rgb();
</del><ins>+ if (color.isExtended())
+ return makePremultipliedRGBA(color.asExtended().red() * 255, color.asExtended().green() * 255, color.asExtended().blue() * 255, color.asExtended().alpha() * 255);
</ins><span class="cx">
</span><del>- return pixelColor;
</del><ins>+ return makePremultipliedRGBA(color.red(), color.green(), color.blue(), color.alpha());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Color blend(const Color& from, const Color& to, double progress, bool blendPremultiplied)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoCairoUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp (211852 => 211853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2017-02-08 01:47:31 UTC (rev 211852)
+++ trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp 2017-02-08 06:41:12 UTC (rev 211853)
</span><span class="lines">@@ -66,9 +66,13 @@
</span><span class="cx">
</span><span class="cx"> void setSourceRGBAFromColor(cairo_t* context, const Color& color)
</span><span class="cx"> {
</span><del>- float red, green, blue, alpha;
- color.getRGBA(red, green, blue, alpha);
- cairo_set_source_rgba(context, red, green, blue, alpha);
</del><ins>+ if (color.isExtended())
+ cairo_set_source_rgba(context, color.asExtended().red(), color.asExtended().green(), color.asExtended().blue(), color.asExtended().alpha());
+ else {
+ float red, green, blue, alpha;
+ color.getRGBA(red, green, blue, alpha);
+ cairo_set_source_rgba(context, red, green, blue, alpha);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void appendPathToCairoContext(cairo_t* to, cairo_t* from)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscairoGraphicsContextCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (211852 => 211853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2017-02-08 01:47:31 UTC (rev 211852)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2017-02-08 06:41:12 UTC (rev 211853)
</span><span class="lines">@@ -70,8 +70,9 @@
</span><span class="cx"> // A helper which quickly fills a rectangle with a simple color fill.
</span><span class="cx"> static inline void fillRectWithColor(cairo_t* cr, const FloatRect& rect, const Color& color)
</span><span class="cx"> {
</span><del>- if (!color.alpha() && cairo_get_operator(cr) == CAIRO_OPERATOR_OVER)
</del><ins>+ if (!color.isVisible() && cairo_get_operator(cr) == CAIRO_OPERATOR_OVER)
</ins><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> setSourceRGBAFromColor(cr, color);
</span><span class="cx"> cairo_rectangle(cr, rect.x(), rect.y(), rect.width(), rect.height());
</span><span class="cx"> cairo_fill(cr);
</span><span class="lines">@@ -387,7 +388,7 @@
</span><span class="cx"> cairo_arc(cr, 0., 0., 1., 0., 2 * piFloat);
</span><span class="cx"> cairo_restore(cr);
</span><span class="cx">
</span><del>- if (fillColor().alpha()) {
</del><ins>+ if (fillColor().isVisible()) {
</ins><span class="cx"> setSourceRGBAFromColor(cr, fillColor());
</span><span class="cx"> cairo_fill_preserve(cr);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgtkColorGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gtk/ColorGtk.cpp (211852 => 211853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gtk/ColorGtk.cpp 2017-02-08 01:47:31 UTC (rev 211852)
+++ trunk/Source/WebCore/platform/graphics/gtk/ColorGtk.cpp 2017-02-08 06:41:12 UTC (rev 211853)
</span><span class="lines">@@ -41,10 +41,12 @@
</span><span class="cx">
</span><span class="cx"> Color::operator GdkRGBA() const
</span><span class="cx"> {
</span><ins>+ if (isExtended())
+ return { asExtended().red(), asExtended().green(), asExtended().blue(), asExtended().alpha() };
+
</ins><span class="cx"> double red, green, blue, alpha;
</span><span class="cx"> getRGBA(red, green, blue, alpha);
</span><del>- GdkRGBA rgba = { red, green, blue, alpha };
- return rgba;
</del><ins>+ return { red, green, blue, alpha };
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperGLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (211852 => 211853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2017-02-08 01:47:31 UTC (rev 211852)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2017-02-08 06:41:12 UTC (rev 211853)
</span><span class="lines">@@ -246,9 +246,15 @@
</span><span class="cx"> cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
</span><span class="cx"> cairo_t* cr = cairo_create(surface);
</span><span class="cx">
</span><del>- float r, g, b, a;
- color.getRGBA(r, g, b, a);
- cairo_set_source_rgba(cr, b, g, r, a); // Since we won't swap R+B when uploading a texture, paint with the swapped R+B color.
</del><ins>+ // Since we won't swap R+B when uploading a texture, paint with the swapped R+B color.
+ if (color.isExtended())
+ cairo_set_source_rgba(cr, color.asExtended().blue(), color.asExtended().green(), color.asExtended().red(), color.asExtended().alpha());
+ else {
+ float r, g, b, a;
+ color.getRGBA(r, g, b, a);
+ cairo_set_source_rgba(cr, b, g, r, a);
+ }
+
</ins><span class="cx"> cairo_rectangle(cr, 0, 0, width, height);
</span><span class="cx"> cairo_fill(cr);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapTextureMapperLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp (211852 => 211853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2017-02-08 01:47:31 UTC (rev 211852)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp 2017-02-08 06:41:12 UTC (rev 211853)
</span><span class="lines">@@ -85,11 +85,10 @@
</span><span class="cx">
</span><span class="cx"> static Color blendWithOpacity(const Color& color, float opacity)
</span><span class="cx"> {
</span><del>- RGBA32 rgba = color.rgb();
- // See Color::getRGBA() to know how to extract alpha from color.
- float alpha = alphaChannel(rgba) / 255.;
- float effectiveAlpha = alpha * opacity;
- return Color(colorWithOverrideAlpha(rgba, effectiveAlpha));
</del><ins>+ if (color.isOpaque() && opacity == 1.)
+ return color;
+
+ return color.colorWithAlphaMultipliedBy(opacity);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TextureMapperLayer::computePatternTransformIfNeeded()
</span><span class="lines">@@ -114,7 +113,7 @@
</span><span class="cx"> transform.multiply(options.transform);
</span><span class="cx"> transform.multiply(m_currentTransform.combined());
</span><span class="cx">
</span><del>- if (m_state.solidColor.isValid() && !m_state.contentsRect.isEmpty() && m_state.solidColor.alpha()) {
</del><ins>+ if (m_state.solidColor.isValid() && !m_state.contentsRect.isEmpty() && m_state.solidColor.isVisible()) {
</ins><span class="cx"> options.textureMapper.drawSolidColor(m_state.contentsRect, transform, blendWithOpacity(m_state.solidColor, options.opacity));
</span><span class="cx"> if (m_state.showDebugBorders)
</span><span class="cx"> options.textureMapper.drawBorder(m_state.debugBorderColor, m_state.debugBorderWidth, layerRect(), transform);
</span><span class="lines">@@ -256,7 +255,7 @@
</span><span class="cx"> FloatRect boundingRect;
</span><span class="cx"> if (m_backingStore || m_state.masksToBounds || m_state.maskLayer || hasFilters())
</span><span class="cx"> boundingRect = layerRect();
</span><del>- else if (m_contentsLayer || m_state.solidColor.alpha())
</del><ins>+ else if (m_contentsLayer || m_state.solidColor.isVisible())
</ins><span class="cx"> boundingRect = m_state.contentsRect;
</span><span class="cx">
</span><span class="cx"> if (m_currentFilters.hasOutsets()) {
</span></span></pre>
</div>
</div>
</body>
</html>