Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (233314 => 233315)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2018-06-28 18:36:48 UTC (rev 233314)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2018-06-28 18:51:07 UTC (rev 233315)
@@ -442,9 +442,8 @@
void drawFocusRing(const Vector<FloatRect>&, float width, float offset, const Color&);
void drawFocusRing(const Path&, float width, float offset, const Color&);
#if PLATFORM(MAC)
- void drawFocusRing(const Path&, double timeOffset, bool& needsRedraw);
- void drawFocusRing(const Vector<FloatRect>&, double timeOffset, bool& needsRedraw);
- static CGColorRef focusRingColor();
+ void drawFocusRing(const Path&, double timeOffset, bool& needsRedraw, const Color&);
+ void drawFocusRing(const Vector<FloatRect>&, double timeOffset, bool& needsRedraw, const Color&);
#endif
void setLineCap(LineCap);
Modified: trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextCocoa.mm (233314 => 233315)
--- trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextCocoa.mm 2018-06-28 18:36:48 UTC (rev 233314)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextCocoa.mm 2018-06-28 18:51:07 UTC (rev 233315)
@@ -60,17 +60,8 @@
#if PLATFORM(MAC)
-CGColorRef GraphicsContext::focusRingColor()
+static bool drawFocusRingAtTime(CGContextRef context, NSTimeInterval timeOffset, const Color& color)
{
- static CGColorRef color = [] {
- CGFloat colorComponents[] = { 0.5, 0.75, 1.0, 1.0 };
- return CGColorCreate(sRGBColorSpaceRef(), colorComponents);
- }();
- return color;
-}
-
-static bool drawFocusRingAtTime(CGContextRef context, NSTimeInterval timeOffset)
-{
CGFocusRingStyle focusRingStyle;
BOOL needsRepaint = NSInitializeCGFocusRingStyleForTime(NSFocusRingOnly, &focusRingStyle, timeOffset);
@@ -79,7 +70,7 @@
// -1. According to CoreGraphics, the reasoning for this behavior has been
// lost in time.
focusRingStyle.accumulate = -1;
- auto style = adoptCF(CGStyleCreateFocusRingWithColor(&focusRingStyle, GraphicsContext::focusRingColor()));
+ auto style = adoptCF(CGStyleCreateFocusRingWithColor(&focusRingStyle, cachedCGColor(color)));
CGContextSaveGState(context);
CGContextSetStyle(context, style.get());
@@ -89,24 +80,24 @@
return needsRepaint;
}
-static void drawFocusRing(CGContextRef context)
+static void drawFocusRing(CGContextRef context, const Color& color)
{
- drawFocusRingAtTime(context, std::numeric_limits<double>::max());
+ drawFocusRingAtTime(context, std::numeric_limits<double>::max(), color);
}
-static void drawFocusRingToContext(CGContextRef context, CGPathRef focusRingPath)
+static void drawFocusRingToContext(CGContextRef context, CGPathRef focusRingPath, const Color& color)
{
CGContextBeginPath(context);
CGContextAddPath(context, focusRingPath);
- drawFocusRing(context);
+ drawFocusRing(context, color);
}
-static bool drawFocusRingToContextAtTime(CGContextRef context, CGPathRef focusRingPath, double timeOffset)
+static bool drawFocusRingToContextAtTime(CGContextRef context, CGPathRef focusRingPath, double timeOffset, const Color& color)
{
UNUSED_PARAM(timeOffset);
CGContextBeginPath(context);
CGContextAddPath(context, focusRingPath);
- return drawFocusRingAtTime(context, std::numeric_limits<double>::max());
+ return drawFocusRingAtTime(context, std::numeric_limits<double>::max(), color);
}
#endif // PLATFORM(MAC)
@@ -122,7 +113,7 @@
return;
}
- drawFocusRingToContext(platformContext(), path.platformPath());
+ drawFocusRingToContext(platformContext(), path.platformPath(), color);
#else
UNUSED_PARAM(path);
UNUSED_PARAM(width);
@@ -132,7 +123,7 @@
}
#if PLATFORM(MAC)
-void GraphicsContext::drawFocusRing(const Path& path, double timeOffset, bool& needsRedraw)
+void GraphicsContext::drawFocusRing(const Path& path, double timeOffset, bool& needsRedraw, const Color& color)
{
if (paintingDisabled() || path.isNull())
return;
@@ -140,10 +131,10 @@
if (m_impl) // FIXME: implement animated focus ring drawing.
return;
- needsRedraw = drawFocusRingToContextAtTime(platformContext(), path.platformPath(), timeOffset);
+ needsRedraw = drawFocusRingToContextAtTime(platformContext(), path.platformPath(), timeOffset, color);
}
-void GraphicsContext::drawFocusRing(const Vector<FloatRect>& rects, double timeOffset, bool& needsRedraw)
+void GraphicsContext::drawFocusRing(const Vector<FloatRect>& rects, double timeOffset, bool& needsRedraw, const Color& color)
{
if (paintingDisabled())
return;
@@ -155,7 +146,7 @@
for (const auto& rect : rects)
CGPathAddRect(focusRingPath.get(), 0, CGRect(rect));
- needsRedraw = drawFocusRingToContextAtTime(platformContext(), focusRingPath.get(), timeOffset);
+ needsRedraw = drawFocusRingToContextAtTime(platformContext(), focusRingPath.get(), timeOffset, color);
}
#endif
@@ -174,7 +165,7 @@
for (auto& rect : rects)
CGPathAddRect(focusRingPath.get(), 0, CGRectInset(rect, -offset, -offset));
- drawFocusRingToContext(platformContext(), focusRingPath.get());
+ drawFocusRingToContext(platformContext(), focusRingPath.get(), color);
#else
UNUSED_PARAM(rects);
UNUSED_PARAM(width);
Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (233314 => 233315)
--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2018-06-28 18:36:48 UTC (rev 233314)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2018-06-28 18:51:07 UTC (rev 233315)
@@ -362,12 +362,15 @@
CGFocusRingStyle focusRingStyle;
bool needsRepaint = NSInitializeCGFocusRingStyleForTime(NSFocusRingOnly, &focusRingStyle, timeOffset);
+
// We want to respect the CGContext clipping and also not overpaint any
// existing focus ring. The way to do this is set accumulate to
// -1. According to CoreGraphics, the reasoning for this behavior has been
// lost in time.
focusRingStyle.accumulate = -1;
- auto style = adoptCF(CGStyleCreateFocusRingWithColor(&focusRingStyle, GraphicsContext::focusRingColor()));
+
+ // FIXME: This color should be shared with RenderThemeMac. For now just use the same NSColor color.
+ auto style = adoptCF(CGStyleCreateFocusRingWithColor(&focusRingStyle, [NSColor keyboardFocusIndicatorColor].CGColor));
CGContextSetStyle(cgContext, style.get());
CGContextBeginTransparencyLayerWithRect(cgContext, NSRectToCGRect(cellFrame), nullptr);
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (233314 => 233315)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2018-06-28 18:36:48 UTC (rev 233314)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2018-06-28 18:51:07 UTC (rev 233315)
@@ -1836,9 +1836,9 @@
for (auto rect : pixelSnappedFocusRingRects)
path.addRect(rect);
}
- paintInfo.context().drawFocusRing(path, page().focusController().timeSinceFocusWasSet().seconds(), needsRepaint);
+ paintInfo.context().drawFocusRing(path, page().focusController().timeSinceFocusWasSet().seconds(), needsRepaint, RenderTheme::focusRingColor(document().styleColorOptions()));
} else
- paintInfo.context().drawFocusRing(pixelSnappedFocusRingRects, page().focusController().timeSinceFocusWasSet().seconds(), needsRepaint);
+ paintInfo.context().drawFocusRing(pixelSnappedFocusRingRects, page().focusController().timeSinceFocusWasSet().seconds(), needsRepaint, RenderTheme::focusRingColor(document().styleColorOptions()));
if (needsRepaint)
page().focusController().setFocusedElementNeedsRepaint();
#else
