Changeset 245752 in webkit

Timestamp:

May 24, 2019 2:41:00 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.cpp (modified) (5 diffs)
• platform/graphics/GraphicsContext.h (modified) (3 diffs)
• rendering/TextPaintStyle.cpp (modified) (3 diffs)
• rendering/TextPaintStyle.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2019-05-24  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp

@@ -110 +110 @@
     CHECK_FOR_CHANGED_PROPERTY(ImageInterpolationQualityChange, imageInterpolationQuality);
 
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    CHECK_FOR_CHANGED_PROPERTY(UseDarkAppearanceChange, useDarkAppearance);
+#endif
+
     return changeFlags;
 }
@@ -178 +182 @@
     if (flags & GraphicsContextState::ImageInterpolationQualityChange)
         m_state.imageInterpolationQuality = state.imageInterpolationQuality;
-    
+
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    if (flags & GraphicsContextState::UseDarkAppearanceChange)
+        m_state.useDarkAppearance = state.useDarkAppearance;
+#endif
+
     m_changeFlags |= flags;
 }
@@ -246 +255 @@
     if (m_changeFlags & GraphicsContextState::ImageInterpolationQualityChange)
         context.setImageInterpolationQuality(m_state.imageInterpolationQuality);
+
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    if (m_changeFlags & GraphicsContextState::UseDarkAppearanceChange)
+        context.setUseDarkAppearance(m_state.useDarkAppearance);
+#endif
 }
 
@@ -313 +327 @@
     if (m_changeFlags & GraphicsContextState::DrawLuminanceMaskChange)
         ts.dumpProperty("draw-luminance-mask", m_state.drawLuminanceMask);
+
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    if (m_changeFlags & GraphicsContextState::UseDarkAppearanceChange)
+        ts.dumpProperty("use-dark-appearance", m_state.useDarkAppearance);
+#endif
 }
 
@@ -939 +958 @@
         m_impl->updateState(m_state, GraphicsContextState::DrawLuminanceMaskChange);
 }
+
+#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
 
 #if !USE(CG) && !USE(DIRECT2D)

trunk/Source/WebCore/platform/graphics/GraphicsContext.h

@@ -164 +164 @@
         DrawLuminanceMaskChange                 = 1 << 20,
         ImageInterpolationQualityChange         = 1 << 21,
+#if HAVE(OS_DARK_MODE_SUPPORT)
+        UseDarkAppearanceChange                 = 1 << 22,
+#endif
     };
     typedef uint32_t StateChangeFlags;
@@ -200 +203 @@
 #endif
     bool drawLuminanceMask : 1;
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    bool useDarkAppearance : 1;
+#endif
 };
 
@@ -410 +416 @@
     void setTextDrawingMode(TextDrawingModeFlags);
     TextDrawingModeFlags textDrawingMode() const { return m_state.textDrawingMode; }
+
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    void setUseDarkAppearance(bool);
+    bool useDarkAppearance() const { return m_state.useDarkAppearance; }
+#endif
 
     float drawText(const FontCascade&, const TextRun&, const FloatPoint&, unsigned from = 0, Optional<unsigned> to = WTF::nullopt);

trunk/Source/WebCore/rendering/TextPaintStyle.cpp

@@ -53 +53 @@
         && useLetterpressEffect == other.useLetterpressEffect
 #endif
+#if HAVE(OS_DARK_MODE_SUPPORT)
+        && useDarkAppearance == other.useDarkAppearance
+#endif
         && lineCap == other.lineCap && miterLimit == other.miterLimit;
 }
@@ -82 +85 @@
     paintStyle.useLetterpressEffect = lineStyle.textDecorationsInEffect().contains(TextDecoration::Letterpress);
 #endif
+
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    paintStyle.useDarkAppearance = frame.document() ? frame.document()->useDarkAppearance(&lineStyle) : false;
+#endif
+
     auto viewportSize = frame.view() ? frame.view()->size() : IntSize();
     paintStyle.strokeWidth = lineStyle.computedStrokeWidth(viewportSize);
@@ -187 +195 @@
     }
 
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    context.setUseDarkAppearance(paintStyle.useDarkAppearance);
+#endif
+
     Color fillColor = fillColorType == UseEmphasisMarkColor ? paintStyle.emphasisMarkColor : paintStyle.fillColor;
     if (mode & TextModeFill && (fillColor != context.fillColor()))

trunk/Source/WebCore/rendering/TextPaintStyle.h

@@ -53 +53 @@
     bool useLetterpressEffect { false };
 #endif
+#if HAVE(OS_DARK_MODE_SUPPORT)
+    bool useDarkAppearance { false };
+#endif
     PaintOrder paintOrder { PaintOrder::Normal };
     LineJoin lineJoin { MiterJoin };