Attachment 357485 Details for Bug 192780 – Patch

[patch] Patch

bug-192780-20181217153550.patch (text/plain), 26.95 KB, created by Simon Fraser (smfr) on 2018-12-17 15:35:51 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2018-12-17 15:35:51 PST

Size: 26.95 KB

patch

obsolete

>Subversion Revision: 239222
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 854ee33b41e81f2b845a701004e4be25b79f5d2b..5e1c393e5b38804168f9c8bde9e3112706192404 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,30 @@
>+2018-12-17  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Don't use more expensive layer backing store formats when subpixel text antialiasing is not enabled
>+        https://bugs.webkit.org/show_bug.cgi?id=192780
>+        rdar://problem/43394387
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        macOS Mojave disabled text subpixel antialiasing by default, so we no longer need to use the
>+        memory-hungry "linear glyph mask" CALayer backing store formats for non-opaque with text in them.
>+        
>+        Add FontCascade::isSubpixelAntialiasingAvailable() which reports whether subpixel antialiasing is available,
>+        and consult it when making decisions that affect layer backing store format.
>+
>+        Tested by new results for existing tests.
>+
>+        * platform/graphics/FontCascade.cpp:
>+        (WebCore::FontCascade::isSubpixelAntialiasingAvailable):
>+        * platform/graphics/FontCascade.h:
>+        * platform/graphics/cocoa/FontCascadeCocoa.mm:
>+        (WebCore::FontCascade::isSubpixelAntialiasingAvailable): CGFontRenderingGetFontSmoothingDisabled() isn't super cheap, so fetch
>+        it once.
>+        * rendering/RenderLayerBacking.cpp:
>+        (WebCore::RenderLayerBacking::updateAfterDescendants):
>+        * testing/Internals.cpp:
>+        (WebCore::Internals::setFontSmoothingEnabled): Remove a WebCore::
>+
> 2018-12-14  Simon Fraser  <simon.fraser@apple.com>
> 
>         REGRESSION (r233268): contents of an animated element inside overflow:hidden disappear
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 53e50089fc5212ddbd1abb2a9613290886bce4d0..477e4b318e403dbe192a77810418f9b980ec4592 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-12-17  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Don't use more expensive layer backing store formats when subpixel text antialiasing is not enabled
>+        https://bugs.webkit.org/show_bug.cgi?id=192780
>+        rdar://problem/43394387
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add CGFontRenderingGetFontSmoothingDisabled().
>+
>+        * pal/spi/cg/CoreGraphicsSPI.h:
>+
> 2018-12-11  Justin Michaud  <justin_michaud@apple.com>
> 
>         Implement feature flag for CSS Typed OM
>diff --git a/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h b/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h
>index 8f0f5a2d09cf01db73ad92e1ad05984cde9cf9f9..1d6e74b4d818dc2043c160383ace9aca2c4875c4 100644
>--- a/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h
>+++ b/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h
>@@ -255,7 +255,7 @@ CGImageRef CGIOSurfaceContextCreateImage(CGContextRef);
> CGImageRef CGIOSurfaceContextCreateImageReference(CGContextRef);
> CGColorSpaceRef CGIOSurfaceContextGetColorSpace(CGContextRef);
> void CGIOSurfaceContextSetDisplayMask(CGContextRef, uint32_t mask);
>-#endif
>+#endif // HAVE(IOSURFACE)
> 
> #if PLATFORM(COCOA)
> bool CGColorSpaceUsesExtendedRange(CGColorSpaceRef);
>@@ -285,8 +285,13 @@ void CGContextDrawConicGradient(CGContextRef, CGGradientRef, CGPoint center, CGF
> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
> void CGPathAddUnevenCornersRoundedRect(CGMutablePathRef, const CGAffineTransform *, CGRect, const CGSize corners[4]);
> #endif
>+
>+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+bool CGFontRenderingGetFontSmoothingDisabled(void);
> #endif
> 
>+#endif // PLATFORM(COCOA)
>+
> #if PLATFORM(WIN)
> CGFontCache* CGFontCacheGetLocalCache();
> void CGFontCacheSetShouldAutoExpire(CGFontCache*, bool);
>@@ -296,7 +301,7 @@ void CGContextSetFontSmoothingStyle(CGContextRef, uint32_t);
> uint32_t CGContextGetFontSmoothingStyle(CGContextRef);
> void CGContextSetShouldUsePlatformNativeGlyphs(CGContextRef, bool);
> void CGContextSetFocusRingWithColor(CGContextRef, CGFloat blur, CGColorRef, const CGRect *clipRect, CFDictionaryRef options);
>-#endif
>+#endif // PLATFORM(WIN)
> 
> #if PLATFORM(MAC)
> void CGSShutdownServerConnections(void);
>@@ -321,6 +326,6 @@ CGSDisplayID CGSMainDisplayID(void);
> 
> #endif // ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
> 
>-#endif
>+#endif // PLATFORM(MAC)
> 
> WTF_EXTERN_C_END
>diff --git a/Source/WebCore/platform/graphics/FontCascade.cpp b/Source/WebCore/platform/graphics/FontCascade.cpp
>index e2d31b296473b57c8753063bed164f33f652e0fd..26a295419b51a40f7db41a631d9931cd079942ea 100644
>--- a/Source/WebCore/platform/graphics/FontCascade.cpp
>+++ b/Source/WebCore/platform/graphics/FontCascade.cpp
>@@ -595,6 +595,13 @@ bool FontCascade::shouldUseSmoothing()
>     return shouldUseFontSmoothing;
> }
> 
>+#if !PLATFORM(COCOA)
>+bool FontCascade::isSubpixelAntialiasingAvailable()
>+{
>+    return false;
>+}
>+#endif
>+
> void FontCascade::setCodePath(CodePath p)
> {
>     s_codePath = p;
>diff --git a/Source/WebCore/platform/graphics/FontCascade.h b/Source/WebCore/platform/graphics/FontCascade.h
>index a792de3e5b9ac2f5f6bfe1dfcd18b6b234af33f3..e88c2f2792537bdf648b93be9f347aa59279017a 100644
>--- a/Source/WebCore/platform/graphics/FontCascade.h
>+++ b/Source/WebCore/platform/graphics/FontCascade.h
>@@ -181,6 +181,8 @@ public:
>     WEBCORE_EXPORT static void setShouldUseSmoothing(bool);
>     WEBCORE_EXPORT static bool shouldUseSmoothing();
> 
>+    static bool isSubpixelAntialiasingAvailable();
>+
>     enum CodePath { Auto, Simple, Complex, SimpleWithGlyphOverflow };
>     CodePath codePath(const TextRun&, std::optional<unsigned> from = std::nullopt, std::optional<unsigned> to = std::nullopt) const;
>     static CodePath characterRangeCodePath(const LChar*, unsigned) { return Simple; }
>diff --git a/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm b/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
>index 4a7f538c4692f9283f15923d68a6e321fe45c128..026d0b3a0d9a6b3a10dcc7357d6364656c22abc6 100644
>--- a/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
>+++ b/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm
>@@ -58,6 +58,25 @@ SOFT_LINK_CLASS(UIKit, UIColor)
> 
> namespace WebCore {
> 
>+// Confusingly, even when CGFontRenderingGetFontSmoothingDisabled() returns true, CGContextSetShouldSmoothFonts() still impacts text
>+// rendering, which is why this function uses the "subpixel antialiasing" rather than "smoothing" terminology.
>+bool FontCascade::isSubpixelAntialiasingAvailable()
>+{
>+#if PLATFORM(MAC)
>+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
>+    static bool subpixelAntialiasingEnabled;
>+    static std::once_flag onceFlag;
>+    std::call_once(onceFlag, [&] () {
>+        subpixelAntialiasingEnabled = !CGFontRenderingGetFontSmoothingDisabled();
>+    });
>+    return subpixelAntialiasingEnabled;
>+#endif
>+    return true;
>+#else
>+    return false;
>+#endif
>+}
>+
> bool FontCascade::canReturnFallbackFontsForComplexText()
> {
>     return true;
>diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
>index 54984777de9bb673a92f840d66110e866501b4f0..5338f2b2c221f2bd6b23df618e0241a9cc640222 100644
>--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
>+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
>@@ -1259,7 +1259,7 @@ void RenderLayerBacking::updateAfterDescendants()
> {
>     // FIXME: this potentially duplicates work we did in updateConfiguration().
>     PaintedContentsInfo contentsInfo(*this);
>-    contentsInfo.setWantsSubpixelAntialiasedTextState(GraphicsLayer::supportsSubpixelAntialiasedLayerText());
>+    contentsInfo.setWantsSubpixelAntialiasedTextState(GraphicsLayer::supportsSubpixelAntialiasedLayerText() && FontCascade::isSubpixelAntialiasingAvailable());
> 
>     if (!m_owningLayer.isRenderViewLayer()) {
>         bool didUpdateContentsRect = false;
>diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
>index c3227214ae82a344ea5c63abb13749ff2a8aa1c5..17ce887f38e7a869a4797125bb0bdb88d5021e40 100644
>--- a/Source/WebCore/testing/Internals.cpp
>+++ b/Source/WebCore/testing/Internals.cpp
>@@ -1629,7 +1629,7 @@ void Internals::invalidateFontCache()
> 
> void Internals::setFontSmoothingEnabled(bool enabled)
> {
>-    WebCore::FontCascade::setShouldUseSmoothing(enabled);
>+    FontCascade::setShouldUseSmoothing(enabled);
> }
> 
> ExceptionOr<void> Internals::setLowPowerModeEnabled(bool isEnabled)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 9e01480c36598f8405b0ddae4f43fb552c0f5423..f36ed4e8e9aaa52a3aa2ee1cf8fb0dd77a7947fa 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-12-17  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Don't use more expensive layer backing store formats when subpixel text antialiasing is not enabled
>+        https://bugs.webkit.org/show_bug.cgi?id=192780
>+        rdar://problem/43394387
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No need to set "AppleFontSmoothing" defaults for WK2.
>+
>+        * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
>+        (WTR::InjectedBundle::platformInitialize):
>+
> 2018-12-14  Chris Dumez  <cdumez@apple.com>
> 
>         [PSON] WebsitePolicies are lost on process-swap
>diff --git a/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm b/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm
>index 360f0d12c691017bc3fd63d2b329598e8f9f67d4..50b1b13d7653210e3cf3ab79702422bd509aa75f 100644
>--- a/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm
>+++ b/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm
>@@ -36,7 +36,6 @@ namespace WTR {
> 
> void InjectedBundle::platformInitialize(WKTypeRef initializationUserData)
> {
>-    static const int NoFontSmoothing = 0;
>     static const int BlueTintedAppearance = 1;
> 
>     // Work around missing /etc/catalog <rdar://problem/4292995>.
>@@ -50,9 +49,6 @@ void InjectedBundle::platformInitialize(WKTypeRef initializationUserData)
> 
>     NSDictionary *dict = @{
>         @"AppleAntiAliasingThreshold": @4,
>-        // FIXME: Setting AppleFontSmoothing is likely unnecessary and ineffective. WebKit2 has its own preference for font smoothing, which is
>-        // applied to each context via CGContextSetShouldSmoothFonts, presumably overriding the default.
>-        @"AppleFontSmoothing": @(NoFontSmoothing),
>         @"AppleAquaColorVariant": @(BlueTintedAppearance),
>         @"AppleHighlightColor": @"0.709800 0.835300 1.000000",
>         @"AppleOtherHighlightColor": @"0.500000 0.500000 0.500000",
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index b50c9ebad99a6bb450492177deca0c76b203accf..4e086a212934b8fa66121603078ada679124df89 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-12-17  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Don't use more expensive layer backing store formats when subpixel text antialiasing is not enabled
>+        https://bugs.webkit.org/show_bug.cgi?id=192780
>+        rdar://problem/43394387
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        New macOS Mojave and later results.
>+
>+        * platform/mac-mojave/compositing/contents-format/subpixel-antialiased-nested-layer-expected.txt: Added.
>+        * platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-configs-antialiasing-style-expected.txt: Added.
>+        * platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-configs-expected.txt: Added.
>+        * platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-enabled-expected.txt: Added.
>+        * platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-images-expected.txt: Added.
>+        * platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-traversal-expected.txt: Added.
>+        * platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-visibility-expected.txt: Added.
>+
> 2018-12-14  Simon Fraser  <simon.fraser@apple.com>
> 
>         REGRESSION (r233268): contents of an animated element inside overflow:hidden disappear
>diff --git a/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-nested-layer-expected.txt b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-nested-layer-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..7c6e83b4fb86a69d7a176abfea5a66e9a57b63af
>--- /dev/null
>+++ b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-nested-layer-expected.txt
>@@ -0,0 +1,20 @@
>+This layer should get smoothing.
>+(GraphicsLayer
>+  (anchor 0.00 0.00)
>+  (bounds 800.00 600.00)
>+  (children 1
>+    (GraphicsLayer
>+      (bounds 800.00 600.00)
>+      (contentsOpaque 1)
>+      (children 1
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 12.00 4.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-configs-antialiasing-style-expected.txt b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-configs-antialiasing-style-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..4a039829cc27023cb9c93de11e84ab1a2e9e012a
>--- /dev/null
>+++ b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-configs-antialiasing-style-expected.txt
>@@ -0,0 +1,130 @@
>+Â  Â  Â 
>+Text here
>+
>+Antialiased text
>+
>+Smoothed text
>+
>+Antialised text
>+Smoothed text
>+
>+Child composited layer
>+
>+Smoothed text
>+
>+Antialiased text
>+
>+Antialiased text
>+
>+Smoothed text
>+
>+Exceeds depth test antialiased
>+
>+Exceeds depth test smoothed
>+
>+(GraphicsLayer
>+  (anchor 0.00 0.00)
>+  (bounds 800.00 600.00)
>+  (children 1
>+    (GraphicsLayer
>+      (bounds 800.00 600.00)
>+      (contentsOpaque 1)
>+      (children 12
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 12.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 182.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 352.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 522.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 12.00 187.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 182.00 187.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 352.00 187.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 522.00 187.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+          (children 1
>+            (GraphicsLayer
>+              (position 27.00 43.00)
>+              (bounds 108.00 60.00)
>+              (drawsContent 1)
>+            )
>+          )
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 12.00 357.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+          (children 1
>+            (GraphicsLayer
>+              (position 27.00 43.00)
>+              (bounds 108.00 20.00)
>+              (drawsContent 1)
>+            )
>+          )
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 182.00 357.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+          (children 1
>+            (GraphicsLayer
>+              (position 27.00 43.00)
>+              (bounds 108.00 20.00)
>+              (drawsContent 1)
>+            )
>+          )
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 352.00 357.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 522.00 357.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-configs-expected.txt b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-configs-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..12cb4fbb177269d2bd7e31c0ed0c454b4d6a2189
>--- /dev/null
>+++ b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-configs-expected.txt
>@@ -0,0 +1,114 @@
>+Â  Â  Â  Solid background
>+Text here
>+
>+Text here
>+
>+Negative z-index child
>+And more content
>+Child layer
>+
>+Child composited layer
>+
>+Child composited layer
>+
>+Text here.  
>+(GraphicsLayer
>+  (anchor 0.00 0.00)
>+  (bounds 800.00 600.00)
>+  (children 1
>+    (GraphicsLayer
>+      (bounds 800.00 600.00)
>+      (contentsOpaque 1)
>+      (children 11
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 12.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 182.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 352.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 522.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 12.00 187.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 182.00 187.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+          (children 1
>+            (GraphicsLayer
>+              (position 27.00 79.00)
>+              (bounds 100.00 40.00)
>+              (drawsContent 1)
>+            )
>+          )
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 352.00 187.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 522.00 187.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+          (children 1
>+            (GraphicsLayer
>+              (position 27.00 43.00)
>+              (bounds 108.00 60.00)
>+              (drawsContent 1)
>+            )
>+          )
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 12.00 357.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+          (children 1
>+            (GraphicsLayer
>+              (position 27.00 43.00)
>+              (bounds 108.00 60.00)
>+              (drawsContent 1)
>+            )
>+          )
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 182.00 357.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 352.00 357.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-enabled-expected.txt b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-enabled-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..e45dd21c5638b8ddace5e0c65be17a7f9d744c77
>--- /dev/null
>+++ b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-enabled-expected.txt
>@@ -0,0 +1,45 @@
>+Normal layer
>+Tiled layer
>+Become-tiled layer
>+(GraphicsLayer
>+  (anchor 0.00 0.00)
>+  (bounds 5018.00 2018.00)
>+  (children 1
>+    (GraphicsLayer
>+      (bounds 5018.00 2018.00)
>+      (contentsOpaque 1)
>+      (tile cache coverage 0, 0 1024 x 1024)
>+      (tile size 512 x 512)
>+      (top left tile 0, 0 tiles grid 2 x 2)
>+      (in window 1)
>+      (children 3
>+        (GraphicsLayer
>+          (position 18.00 10.00)
>+          (bounds 100.00 100.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (position 18.00 120.00)
>+          (bounds 5000.00 100.00)
>+          (usingTiledLayer 1)
>+          (drawsContent 1)
>+          (tile cache coverage 0, 0 1024 x 100)
>+          (tile size 512 x 512)
>+          (top left tile 0, 0 tiles grid 2 x 1)
>+          (in window 1)
>+        )
>+        (GraphicsLayer
>+          (position 18.00 230.00)
>+          (bounds 5000.00 100.00)
>+          (usingTiledLayer 1)
>+          (drawsContent 1)
>+          (tile cache coverage 0, 0 1024 x 100)
>+          (tile size 512 x 512)
>+          (top left tile 0, 0 tiles grid 2 x 1)
>+          (in window 1)
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-images-expected.txt b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-images-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..ae086affa1523294a4e9d862f6cb92cf6c6cff12
>--- /dev/null
>+++ b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-images-expected.txt
>@@ -0,0 +1,68 @@
>+ Image and some text   
>+Image and some text child layer
>+
>+Image and some text with z-index
>+
>+Image and some text child composited
>+(GraphicsLayer
>+  (anchor 0.00 0.00)
>+  (bounds 800.00 600.00)
>+  (children 1
>+    (GraphicsLayer
>+      (bounds 800.00 600.00)
>+      (contentsOpaque 1)
>+      (children 7
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 12.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 182.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 352.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 522.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 12.00 187.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 182.00 187.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 352.00 187.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+          (children 1
>+            (GraphicsLayer
>+              (position 27.00 101.00)
>+              (bounds 108.00 60.00)
>+              (drawsContent 1)
>+            )
>+          )
>+        )
>+      )
>+    )
>+  )
>+)
>+
>diff --git a/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-traversal-expected.txt b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-traversal-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..f85909b21796ee67cdf014682237efaa2dcd8ed4
>--- /dev/null
>+++ b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-traversal-expected.txt
>@@ -0,0 +1,40 @@
>+(GraphicsLayer
>+  (anchor 0.00 0.00)
>+  (bounds 1163.00 1244.00)
>+  (children 1
>+    (GraphicsLayer
>+      (bounds 1163.00 1244.00)
>+      (contentsOpaque 1)
>+      (children 4
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 12.00 17.00)
>+          (bounds 162.00 606.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 182.00 17.00)
>+          (bounds 162.00 606.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 352.00 17.00)
>+          (bounds 635.00 1215.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 522.00 17.00)
>+          (bounds 641.00 1227.00)
>+          (drawsContent 1)
>+        )
>+      )
>+    )
>+  )
>+)
>+01234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798
>+0123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899
>+0
>+0
>diff --git a/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-visibility-expected.txt b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-visibility-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..a8c8f47a477a79b8ebd09eccbe74fa6080601d4b
>--- /dev/null
>+++ b/LayoutTests/platform/mac-mojave/compositing/contents-format/subpixel-antialiased-text-visibility-expected.txt
>@@ -0,0 +1,46 @@
>+Visibility hidden ancestor with visible child
>+
>+
>+
>+Only visible text is antialiased
>+
>+This text is antialiased. There is a hidden smoothed child
>+
>+
>+(GraphicsLayer
>+  (anchor 0.00 0.00)
>+  (bounds 800.00 600.00)
>+  (children 1
>+    (GraphicsLayer
>+      (bounds 800.00 600.00)
>+      (contentsOpaque 1)
>+      (children 4
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 12.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 182.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 352.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+        (GraphicsLayer
>+          (offsetFromRenderer width=-6 height=-6)
>+          (position 522.00 17.00)
>+          (bounds 162.00 162.00)
>+          (drawsContent 1)
>+        )
>+      )
>+    )
>+  )
>+)
>+

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 192780: 357485