[Skia] Text rendered as much less heavy compared to other browsers

Scony · Scony · commit e477d92e4d7d · 2026-03-04T13:56:28.000+01:00
https://bugs.webkit.org/show_bug.cgi?id=309152 Reviewed by NOBODY (OOPS!). Explanation of why this fixes the bug (OOPS!). No new tests (OOPS!).
diff --git a/LayoutTests/fast/snapshot/nested-stacking-context.html b/LayoutTests/fast/snapshot/nested-stacking-context.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-10000" />
+<meta name="fuzzy" content="maxDifference=0-2; totalPixels=0-10000" />
 <style>
 #box {
     width: 100px;
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/text-shadow/color-inherit.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-text-decor/text-shadow/color-inherit.html
@@ -1,5 +1,6 @@
 <!DOCTYPE HTML>
 <link rel="help" href="https://drafts.csswg.org/css-text-decor-3/#text-shadow-property">
 <link rel="match" href="color-inherit-ref.html">
+<meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-1">
 <div style="position: absolute; top: 24px; left: 24px; color: blue; text-shadow: 3px 3px;">Hello</div>
 
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-view-transitions/table-caption.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-view-transitions/table-caption.html
@@ -7,6 +7,7 @@
 <link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
 <link rel="author" href="https://mozilla.org" title="Mozilla">
 <link rel="match" href="table-caption-ref.html">
+<meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-2">
 <style>
   table {
     view-transition-name: table;
diff --git a/LayoutTests/imported/w3c/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future.html b/LayoutTests/imported/w3c/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/bold_object/bold_timestamp_future.html
@@ -2,6 +2,7 @@
 <html class="reftest-wait">
 <title>WebVTT rendering, bold object transition with timestamp, ::cue(b:future) selector</title>
 <link rel="match" href="bold_timestamp_future-ref.html">
+<meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-1">
 <style>
 html { overflow:hidden }
 body { margin:0 }
diff --git a/LayoutTests/imported/w3c/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector.html b/LayoutTests/imported/w3c/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/not_root_selector.html
@@ -2,6 +2,7 @@
 <html class="reftest-wait">
 <title>WebVTT rendering, ::cue(:not(:root)) should not match the root</title>
 <link rel="match" href="not_root_selector-ref.html">
+<meta name="fuzzy" content="maxDifference=0-1; totalPixels=0-1">
 <style>
 html { overflow:hidden }
 body { margin:0 }
diff --git a/Source/WebCore/platform/graphics/FontRenderOptions.h b/Source/WebCore/platform/graphics/FontRenderOptions.h
@@ -86,6 +86,12 @@ class FontRenderOptions {
     SkPixelGeometry subpixelOrder() const;
     void setUseSubpixelPositioning(bool enable) { m_useSubpixelPositioning = enable; }
     bool useSubpixelPositioning() const;
+
+    // Make text look better at the expense of incorrect anti-aliasing blending.
+    static constexpr SkScalar s_textContrast { 0 };
+    static constexpr SkScalar s_textGamma { 1 };
+    SkScalar textContrast() const { return s_textContrast; };
+    SkScalar textGamma() const { return s_textGamma; };
 #endif
 
     WEBCORE_EXPORT void disableHintingForTesting();
diff --git a/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp b/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
@@ -1154,7 +1154,7 @@ static sk_sp<SkSurface> createAcceleratedSurface(const IntSize& size)
     RELEASE_ASSERT(grContext);
 
     auto imageInfo = SkImageInfo::Make(size.width(), size.height(), kRGBA_8888_SkColorType, kPremul_SkAlphaType, SkColorSpace::MakeSRGB());
-    SkSurfaceProps properties { 0, FontRenderOptions::singleton().subpixelOrder() };
+    SkSurfaceProps properties { 0, FontRenderOptions::singleton().subpixelOrder(), FontRenderOptions::singleton().textContrast(), FontRenderOptions::singleton().textGamma() };
     auto surface = SkSurfaces::RenderTarget(grContext, skgpu::Budgeted::kNo, imageInfo, PlatformDisplay::sharedDisplay().msaaSampleCount(), kTopLeft_GrSurfaceOrigin, &properties);
     if (!surface || !surface->getCanvas())
         return nullptr;
diff --git a/Source/WebCore/platform/graphics/skia/ImageBufferSkiaAcceleratedBackend.cpp b/Source/WebCore/platform/graphics/skia/ImageBufferSkiaAcceleratedBackend.cpp
@@ -121,7 +121,7 @@ std::unique_ptr<ImageBufferSkiaAcceleratedBackend> ImageBufferSkiaAcceleratedBac
         flags |= SkSurfaceProps::kDynamicMSAA_Flag;
         msaaSampleCount = 1;
     }
-    SkSurfaceProps properties { flags, FontRenderOptions::singleton().subpixelOrder() };
+    SkSurfaceProps properties { flags, FontRenderOptions::singleton().subpixelOrder(), FontRenderOptions::singleton().textContrast(), FontRenderOptions::singleton().textGamma() };
     auto surface = SkSurfaces::RenderTarget(grContext, skgpu::Budgeted::kNo, imageInfo, msaaSampleCount, kTopLeft_GrSurfaceOrigin, &properties);
     if (!surface || !surface->getCanvas())
         return nullptr;
diff --git a/Source/WebCore/platform/graphics/skia/ImageBufferSkiaUnacceleratedBackend.cpp b/Source/WebCore/platform/graphics/skia/ImageBufferSkiaUnacceleratedBackend.cpp
@@ -46,7 +46,7 @@ std::unique_ptr<ImageBufferSkiaUnacceleratedBackend> ImageBufferSkiaUnaccelerate
         return nullptr;
 
     auto imageInfo = SkImageInfo::MakeN32Premul(backendSize.width(), backendSize.height(), parameters.colorSpace.platformColorSpace());
-    SkSurfaceProps properties = { 0, FontRenderOptions::singleton().subpixelOrder() };
+    SkSurfaceProps properties = { 0, FontRenderOptions::singleton().subpixelOrder(), FontRenderOptions::singleton().textContrast(), FontRenderOptions::singleton().textGamma() };
     auto surface = SkSurfaces::Raster(imageInfo, &properties);
     if (!surface || !surface->getCanvas())
         return nullptr;
diff --git a/Source/WebCore/platform/graphics/skia/PlatformDisplaySkia.cpp b/Source/WebCore/platform/graphics/skia/PlatformDisplaySkia.cpp
@@ -217,7 +217,7 @@ static unsigned initializeMSAASampleCount(GrDirectContext* grContext)
         // knows there are bugs. The only way to know whether our sample count will work is trying to create a
         // surface with that value and check whether it works.
         auto imageInfo = SkImageInfo::Make(512, 512, kRGBA_8888_SkColorType, kPremul_SkAlphaType, SkColorSpace::MakeSRGB());
-        SkSurfaceProps properties = { 0, FontRenderOptions::singleton().subpixelOrder() };
+        SkSurfaceProps properties = { 0, FontRenderOptions::singleton().subpixelOrder(), FontRenderOptions::singleton().textContrast(), FontRenderOptions::singleton().textGamma() };
         auto surface = SkSurfaces::RenderTarget(grContext, skgpu::Budgeted::kNo, imageInfo, sampleCount, kTopLeft_GrSurfaceOrigin, &properties);
 
         // If the creation of the surface failed, disable MSAA.
diff --git a/Source/WebCore/platform/graphics/skia/ShareableBitmapSkia.cpp b/Source/WebCore/platform/graphics/skia/ShareableBitmapSkia.cpp
@@ -60,7 +60,7 @@ CheckedUint32 ShareableBitmapConfiguration::calculateBytesPerRow(const IntSize&
 sk_sp<SkSurface> ShareableBitmap::createSurface()
 {
     ref();
-    SkSurfaceProps properties = { 0, FontRenderOptions::singleton().subpixelOrder() };
+    SkSurfaceProps properties = { 0, FontRenderOptions::singleton().subpixelOrder(), FontRenderOptions::singleton().textContrast(), FontRenderOptions::singleton().textGamma() };
     auto surface = SkSurfaces::WrapPixels(m_configuration.imageInfo(), mutableSpan().data(), bytesPerRow(), [](void*, void* context) {
         static_cast<ShareableBitmap*>(context)->deref();
     }, this, &properties);
diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedTileBuffer.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedTileBuffer.cpp
@@ -150,7 +150,7 @@ bool CoordinatedUnacceleratedTileBuffer::tryEnsureSurface()
 
     auto imageInfo = SkImageInfo::Make(m_size.width(), m_size.height(), kBGRA_8888_SkColorType, kPremul_SkAlphaType, SkColorSpace::MakeSRGB());
     // FIXME: ref buffer and unref on release proc?
-    SkSurfaceProps properties = { 0, FontRenderOptions::singleton().subpixelOrder() };
+    SkSurfaceProps properties = { 0, FontRenderOptions::singleton().subpixelOrder(), FontRenderOptions::singleton().textContrast(), FontRenderOptions::singleton().textGamma() };
     m_surface = SkSurfaces::WrapPixels(imageInfo, data(), imageInfo.minRowBytes64(), &properties);
     return true;
 }
@@ -200,7 +200,7 @@ bool CoordinatedAcceleratedTileBuffer::tryEnsureSurface()
     unsigned msaaSampleCount = PlatformDisplay::sharedDisplay().msaaSampleCount();
 #endif
 
-    SkSurfaceProps properties = { 0, FontRenderOptions::singleton().subpixelOrder() };
+    SkSurfaceProps properties = { 0, FontRenderOptions::singleton().subpixelOrder(), FontRenderOptions::singleton().textContrast(), FontRenderOptions::singleton().textGamma() };
     m_surface = SkSurfaces::WrapBackendTexture(PlatformDisplay::sharedDisplay().skiaGrContext(),
         backendTexture,
         kTopLeft_GrSurfaceOrigin,
diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/AcceleratedSurface.cpp b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/AcceleratedSurface.cpp
@@ -227,7 +227,7 @@ SkSurface* AcceleratedSurface::RenderTargetShareableBuffer::skiaSurface()
         if (!skiaGLContext->makeContextCurrent())
             return nullptr;
 
-        SkSurfaceProps properties { 0, FontRenderOptions::singleton().subpixelOrder() };
+        SkSurfaceProps properties { 0, FontRenderOptions::singleton().subpixelOrder(), FontRenderOptions::singleton().textContrast(), FontRenderOptions::singleton().textGamma() };
         auto skiaSurface = SkSurfaces::WrapBackendRenderTarget(
             display.skiaGrContext(),
             renderTargetSkia,

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ std::unique_ptr<ImageBufferSkiaAcceleratedBackend> ImageBufferSkiaAcceleratedBac`
`121`	`121`	`flags \|= SkSurfaceProps::kDynamicMSAA_Flag;`
`122`	`122`	`msaaSampleCount = 1;`
`123`	`123`	`}`
`124`		`- SkSurfaceProps properties { flags, FontRenderOptions::singleton().subpixelOrder() };`
	`124`	`+ SkSurfaceProps properties { flags, FontRenderOptions::singleton().subpixelOrder(), FontRenderOptions::singleton().textContrast(), FontRenderOptions::singleton().textGamma() };`
`125`	`125`	`auto surface = SkSurfaces::RenderTarget(grContext, skgpu::Budgeted::kNo, imageInfo, msaaSampleCount, kTopLeft_GrSurfaceOrigin, &properties);`
`126`	`126`	`if (!surface \|\| !surface->getCanvas())`
`127`	`127`	`return nullptr;`