<!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>[245752] 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/245752">245752</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2019-05-24 14:41:00 -0700 (Fri, 24 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Plumb dark appearance down to GraphicsContext.
https://bugs.webkit.org/show_bug.cgi?id=198224
rdar://problem/51068494

Reviewed by Dean Jackson.

No test yet, as it is not testable until this gets used.

* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContextStateChange::changesFromState const):
(WebCore::GraphicsContextStateChange::accumulate):
(WebCore::GraphicsContextStateChange::apply const):
(WebCore::GraphicsContextStateChange::dump const):
(WebCore::GraphicsContext::setUseDarkAppearance):
* platform/graphics/GraphicsContext.h:
(WebCore::GraphicsContext::useDarkAppearance const):
* rendering/TextPaintStyle.cpp:
(WebCore::TextPaintStyle::operator== const):
(WebCore::computeTextPaintStyle):
(WebCore::updateGraphicsContext):
* rendering/TextPaintStyle.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintStylecpp">trunk/Source/WebCore/rendering/TextPaintStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintStyleh">trunk/Source/WebCore/rendering/TextPaintStyle.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (245751 => 245752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-05-24 19:49:57 UTC (rev 245751)
+++ trunk/Source/WebCore/ChangeLog      2019-05-24 21:41:00 UTC (rev 245752)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2019-05-24  Timothy Hatcher  <timothy@apple.com>
+
+        Plumb dark appearance down to GraphicsContext.
+        https://bugs.webkit.org/show_bug.cgi?id=198224
+        rdar://problem/51068494
+
+        Reviewed by Dean Jackson.
+
+        No test yet, as it is not testable until this gets used.
+
+        * platform/graphics/GraphicsContext.cpp:
+        (WebCore::GraphicsContextStateChange::changesFromState const):
+        (WebCore::GraphicsContextStateChange::accumulate):
+        (WebCore::GraphicsContextStateChange::apply const):
+        (WebCore::GraphicsContextStateChange::dump const):
+        (WebCore::GraphicsContext::setUseDarkAppearance):
+        * platform/graphics/GraphicsContext.h:
+        (WebCore::GraphicsContext::useDarkAppearance const):
+        * rendering/TextPaintStyle.cpp:
+        (WebCore::TextPaintStyle::operator== const):
+        (WebCore::computeTextPaintStyle):
+        (WebCore::updateGraphicsContext):
+        * rendering/TextPaintStyle.h:
+
</ins><span class="cx"> 2019-05-24  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Make sure completion handler is always called in SWServer::startSuspension
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (245751 => 245752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp       2019-05-24 19:49:57 UTC (rev 245751)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp  2019-05-24 21:41:00 UTC (rev 245752)
</span><span class="lines">@@ -109,6 +109,10 @@
</span><span class="cx">     CHECK_FOR_CHANGED_PROPERTY(DrawLuminanceMaskChange, drawLuminanceMask);
</span><span class="cx">     CHECK_FOR_CHANGED_PROPERTY(ImageInterpolationQualityChange, imageInterpolationQuality);
</span><span class="cx"> 
</span><ins>+#if HAVE(OS_DARK_MODE_SUPPORT)
+    CHECK_FOR_CHANGED_PROPERTY(UseDarkAppearanceChange, useDarkAppearance);
+#endif
+
</ins><span class="cx">     return changeFlags;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -177,7 +181,12 @@
</span><span class="cx"> 
</span><span class="cx">     if (flags & GraphicsContextState::ImageInterpolationQualityChange)
</span><span class="cx">         m_state.imageInterpolationQuality = state.imageInterpolationQuality;
</span><del>-    
</del><ins>+
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    if (flags & GraphicsContextState::UseDarkAppearanceChange)
+        m_state.useDarkAppearance = state.useDarkAppearance;
+#endif
+
</ins><span class="cx">     m_changeFlags |= flags;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -245,6 +254,11 @@
</span><span class="cx"> 
</span><span class="cx">     if (m_changeFlags & GraphicsContextState::ImageInterpolationQualityChange)
</span><span class="cx">         context.setImageInterpolationQuality(m_state.imageInterpolationQuality);
</span><ins>+
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    if (m_changeFlags & GraphicsContextState::UseDarkAppearanceChange)
+        context.setUseDarkAppearance(m_state.useDarkAppearance);
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void GraphicsContextStateChange::dump(TextStream& ts) const
</span><span class="lines">@@ -312,6 +326,11 @@
</span><span class="cx"> 
</span><span class="cx">     if (m_changeFlags & GraphicsContextState::DrawLuminanceMaskChange)
</span><span class="cx">         ts.dumpProperty("draw-luminance-mask", m_state.drawLuminanceMask);
</span><ins>+
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    if (m_changeFlags & GraphicsContextState::UseDarkAppearanceChange)
+        ts.dumpProperty("use-dark-appearance", m_state.useDarkAppearance);
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> TextStream& operator<<(TextStream& ts, const GraphicsContextStateChange& stateChange)
</span><span class="lines">@@ -939,6 +958,15 @@
</span><span class="cx">         m_impl->updateState(m_state, GraphicsContextState::DrawLuminanceMaskChange);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if HAVE(OS_DARK_MODE_SUPPORT)
+void GraphicsContext::setUseDarkAppearance(bool useDarkAppearance)
+{
+    m_state.useDarkAppearance = useDarkAppearance;
+    if (m_impl)
+        m_impl->updateState(m_state, GraphicsContextState::UseDarkAppearanceChange);
+}
+#endif
+
</ins><span class="cx"> #if !USE(CG) && !USE(DIRECT2D)
</span><span class="cx"> // Implement this if you want to go push the drawing mode into your native context immediately.
</span><span class="cx"> void GraphicsContext::setPlatformTextDrawingMode(TextDrawingModeFlags)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (245751 => 245752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2019-05-24 19:49:57 UTC (rev 245751)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h    2019-05-24 21:41:00 UTC (rev 245752)
</span><span class="lines">@@ -163,6 +163,9 @@
</span><span class="cx">         ShouldSubpixelQuantizeFontsChange       = 1 << 19,
</span><span class="cx">         DrawLuminanceMaskChange                 = 1 << 20,
</span><span class="cx">         ImageInterpolationQualityChange         = 1 << 21,
</span><ins>+#if HAVE(OS_DARK_MODE_SUPPORT)
+        UseDarkAppearanceChange                 = 1 << 22,
+#endif
</ins><span class="cx">     };
</span><span class="cx">     typedef uint32_t StateChangeFlags;
</span><span class="cx"> 
</span><span class="lines">@@ -199,6 +202,9 @@
</span><span class="cx">     bool shadowsUseLegacyRadius : 1;
</span><span class="cx"> #endif
</span><span class="cx">     bool drawLuminanceMask : 1;
</span><ins>+#if HAVE(OS_DARK_MODE_SUPPORT)
+    bool useDarkAppearance : 1;
+#endif
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> struct ImagePaintingOptions {
</span><span class="lines">@@ -410,6 +416,11 @@
</span><span class="cx">     void setTextDrawingMode(TextDrawingModeFlags);
</span><span class="cx">     TextDrawingModeFlags textDrawingMode() const { return m_state.textDrawingMode; }
</span><span class="cx"> 
</span><ins>+#if HAVE(OS_DARK_MODE_SUPPORT)
+    void setUseDarkAppearance(bool);
+    bool useDarkAppearance() const { return m_state.useDarkAppearance; }
+#endif
+
</ins><span class="cx">     float drawText(const FontCascade&, const TextRun&, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = WTF::nullopt);
</span><span class="cx">     void drawGlyphs(const Font&, const GlyphBuffer&, unsigned from, unsigned numGlyphs, const FloatPoint&, FontSmoothingMode);
</span><span class="cx">     void drawEmphasisMarks(const FontCascade&, const TextRun&, const AtomicString& mark, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = WTF::nullopt);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPaintStyle.cpp (245751 => 245752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPaintStyle.cpp        2019-05-24 19:49:57 UTC (rev 245751)
+++ trunk/Source/WebCore/rendering/TextPaintStyle.cpp   2019-05-24 21:41:00 UTC (rev 245752)
</span><span class="lines">@@ -52,6 +52,9 @@
</span><span class="cx"> #if ENABLE(LETTERPRESS)
</span><span class="cx">         && useLetterpressEffect == other.useLetterpressEffect
</span><span class="cx"> #endif
</span><ins>+#if HAVE(OS_DARK_MODE_SUPPORT)
+        && useDarkAppearance == other.useDarkAppearance
+#endif
</ins><span class="cx">         && lineCap == other.lineCap && miterLimit == other.miterLimit;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -81,6 +84,11 @@
</span><span class="cx"> #if ENABLE(LETTERPRESS)
</span><span class="cx">     paintStyle.useLetterpressEffect = lineStyle.textDecorationsInEffect().contains(TextDecoration::Letterpress);
</span><span class="cx"> #endif
</span><ins>+
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    paintStyle.useDarkAppearance = frame.document() ? frame.document()->useDarkAppearance(&lineStyle) : false;
+#endif
+
</ins><span class="cx">     auto viewportSize = frame.view() ? frame.view()->size() : IntSize();
</span><span class="cx">     paintStyle.strokeWidth = lineStyle.computedStrokeWidth(viewportSize);
</span><span class="cx">     paintStyle.paintOrder = lineStyle.paintOrder();
</span><span class="lines">@@ -186,6 +194,10 @@
</span><span class="cx">         mode = newMode;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+#if HAVE(OS_DARK_MODE_SUPPORT)
+    context.setUseDarkAppearance(paintStyle.useDarkAppearance);
+#endif
+
</ins><span class="cx">     Color fillColor = fillColorType == UseEmphasisMarkColor ? paintStyle.emphasisMarkColor : paintStyle.fillColor;
</span><span class="cx">     if (mode & TextModeFill && (fillColor != context.fillColor()))
</span><span class="cx">         context.setFillColor(fillColor);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPaintStyle.h (245751 => 245752)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPaintStyle.h  2019-05-24 19:49:57 UTC (rev 245751)
+++ trunk/Source/WebCore/rendering/TextPaintStyle.h     2019-05-24 21:41:00 UTC (rev 245752)
</span><span class="lines">@@ -52,6 +52,9 @@
</span><span class="cx"> #if ENABLE(LETTERPRESS)
</span><span class="cx">     bool useLetterpressEffect { false };
</span><span class="cx"> #endif
</span><ins>+#if HAVE(OS_DARK_MODE_SUPPORT)
+    bool useDarkAppearance { false };
+#endif
</ins><span class="cx">     PaintOrder paintOrder { PaintOrder::Normal };
</span><span class="cx">     LineJoin lineJoin { MiterJoin };
</span><span class="cx">     LineCap lineCap { ButtCap };
</span></span></pre>
</div>
</div>

</body>
</html>