Title: [239678] tags/Safari-607.1.18.1
- Revision
- 239678
- Author
- [email protected]
- Date
- 2019-01-07 09:57:26 -0800 (Mon, 07 Jan 2019)
Log Message
Revert r239677. rdar://problem/47014944
Modified Paths
Removed Paths
Diff
Modified: tags/Safari-607.1.18.1/LayoutTests/ChangeLog (239677 => 239678)
--- tags/Safari-607.1.18.1/LayoutTests/ChangeLog 2019-01-07 17:50:35 UTC (rev 239677)
+++ tags/Safari-607.1.18.1/LayoutTests/ChangeLog 2019-01-07 17:57:26 UTC (rev 239678)
@@ -1,5 +1,9 @@
2019-01-07 Alan Coon <[email protected]>
+ Revert r239677. rdar://problem/47014944
+
+2019-01-07 Alan Coon <[email protected]>
+
Cherry-pick r239591. rdar://problem/47014944
REGRESSION (r239306): Don't disable font smoothing in transparent layers on macOS Mojave and later
Deleted: tags/Safari-607.1.18.1/LayoutTests/compositing/contents-format/subpixel-antialiased-text-expected.html (239677 => 239678)
--- tags/Safari-607.1.18.1/LayoutTests/compositing/contents-format/subpixel-antialiased-text-expected.html 2019-01-07 17:50:35 UTC (rev 239677)
+++ tags/Safari-607.1.18.1/LayoutTests/compositing/contents-format/subpixel-antialiased-text-expected.html 2019-01-07 17:57:26 UTC (rev 239678)
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- .container {
- display: inline-block;
- height: 100px;
- width: 220px;
- padding: 5px;
- margin: 10px;
- border: 1px solid black;
- box-sizing: border-box;
- font-family: monospace;
- }
-
- .antialiased {
- -webkit-font-smoothing: antialiased;
- }
-
- .smoothed {
- -webkit-font-smoothing: subpixel-antialiased;
- }
- </style>
- <script>
- if (window.internals) {
- internals.setFontSmoothingEnabled(true);
- internals.settings.setSubpixelAntialiasedLayerTextEnabled(true)
- }
- </script>
-</head>
-<body>
-
-<h2>Composited vs. non-composited</h2>
-<section>
-<div class="container">
- This text should have the normal appearance.<br> a b c d e f g h i j k l m n o p q r s t u v w x y z
-</div>
-
-<div class="container">
- This text should have the normal appearance.<br> a b c d e f g h i j k l m n o p q r s t u v w x y z
-</div>
-</section>
-
-<h2>Non-composited: antialiased vs. smoothed</h2>
-
-<section>
- <div class="container antialiased">
- This text should look visibly thinner.<br> a b c d e f g h i j k l m n o p q r s t u v w x y z
- </div>
-
- <div class="container smoothed">
- This text should have the normal appearance.<br> a b c d e f g h i j k l m n o p q r s t u v w x y z
- </div>
-</section>
-
-<h2>Composited: antialiased vs. smoothed</h2>
-
-<section>
- <div class="container antialiased">
- This text should look visibly thinner.<br> a b c d e f g h i j k l m n o p q r s t u v w x y z
- </div>
-
- <div class="container smoothed">
- This text should have the normal appearance.<br> a b c d e f g h i j k l m n o p q r s t u v w x y z
- </div>
-</section>
-
-
-</body>
-</html>
Deleted: tags/Safari-607.1.18.1/LayoutTests/compositing/contents-format/subpixel-antialiased-text.html (239677 => 239678)
--- tags/Safari-607.1.18.1/LayoutTests/compositing/contents-format/subpixel-antialiased-text.html 2019-01-07 17:50:35 UTC (rev 239677)
+++ tags/Safari-607.1.18.1/LayoutTests/compositing/contents-format/subpixel-antialiased-text.html 2019-01-07 17:57:26 UTC (rev 239678)
@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
- <style>
- .container {
- display: inline-block;
- height: 100px;
- width: 220px;
- padding: 5px;
- margin: 10px;
- border: 1px solid black;
- box-sizing: border-box;
- font-family: monospace;
- }
-
- .composited {
- will-change: transform;
- }
-
- .antialiased {
- -webkit-font-smoothing: antialiased;
- }
-
- .smoothed {
- -webkit-font-smoothing: subpixel-antialiased;
- }
- </style>
- <script>
- if (window.internals) {
- internals.setFontSmoothingEnabled(true);
- internals.settings.setSubpixelAntialiasedLayerTextEnabled(true)
- }
- </script>
-</head>
-<body>
-
-<h2>Composited vs. non-composited</h2>
-<section>
-<div class="container">
- This text should have the normal appearance.<br> a b c d e f g h i j k l m n o p q r s t u v w x y z
-</div>
-
-<div class="composited container">
- This text should have the normal appearance.<br> a b c d e f g h i j k l m n o p q r s t u v w x y z
-</div>
-</section>
-
-<h2>Non-composited: antialiased vs. smoothed</h2>
-
-<section>
- <div class="container antialiased">
- This text should look visibly thinner.<br> a b c d e f g h i j k l m n o p q r s t u v w x y z
- </div>
-
- <div class="container smoothed">
- This text should have the normal appearance.<br> a b c d e f g h i j k l m n o p q r s t u v w x y z
- </div>
-</section>
-
-<h2>Composited: antialiased vs. smoothed</h2>
-
-<section>
- <div class="container composited antialiased">
- This text should look visibly thinner.<br> a b c d e f g h i j k l m n o p q r s t u v w x y z
- </div>
-
- <div class="container composited smoothed">
- This text should have the normal appearance.<br> a b c d e f g h i j k l m n o p q r s t u v w x y z
- </div>
-</section>
-
-
-</body>
-</html>
Modified: tags/Safari-607.1.18.1/LayoutTests/platform/mac/TestExpectations (239677 => 239678)
--- tags/Safari-607.1.18.1/LayoutTests/platform/mac/TestExpectations 2019-01-07 17:50:35 UTC (rev 239677)
+++ tags/Safari-607.1.18.1/LayoutTests/platform/mac/TestExpectations 2019-01-07 17:57:26 UTC (rev 239678)
@@ -1752,9 +1752,6 @@
[ Mojave+ ] imported/blink/fast/text/international/text-shaping-arabic.html [ ImageOnlyFailure ]
[ Mojave+ ] imported/blink/fast/text/international/vertical-positioning-with-combining-marks.html [ ImageOnlyFailure ]
-# < Mojave uses font smoothing.
-[ Sierra HighSierra ] compositing/contents-format/subpixel-antialiased-text.html [ ImageOnlyFailure ]
-
# < Mojave doesn't support the CG needed for Conic Gradients
[ Mojave+ ] http/wpt/css/css-images-4/conic-gradient-parsing.html [ Pass ]
[ Mojave+ ] fast/gradients/conic-repeating.html [ Pass ]
@@ -1816,4 +1813,4 @@
webkit.org/b/192956 [ Sierra ] webgpu/webgpu-basics.html [ Skip ]
webkit.org/b/192956 [ Sierra ] webgpu/webgpu-enabled.html [ Skip ]
webkit.org/b/192956 [ Sierra ] webgpu/simple-triangle-strip.html [ Skip ]
-webkit.org/b/192956 [ Sierra ] webgpu/vertex-buffer-triangle-strip.html [ Skip ]
+webkit.org/b/192956 [ Sierra ] webgpu/vertex-buffer-triangle-strip.html [ Skip ]
\ No newline at end of file
Modified: tags/Safari-607.1.18.1/Source/WebCore/ChangeLog (239677 => 239678)
--- tags/Safari-607.1.18.1/Source/WebCore/ChangeLog 2019-01-07 17:50:35 UTC (rev 239677)
+++ tags/Safari-607.1.18.1/Source/WebCore/ChangeLog 2019-01-07 17:57:26 UTC (rev 239678)
@@ -1,5 +1,9 @@
2019-01-07 Alan Coon <[email protected]>
+ Revert r239677. rdar://problem/47014944
+
+2019-01-07 Alan Coon <[email protected]>
+
Cherry-pick r239591. rdar://problem/47014944
REGRESSION (r239306): Don't disable font smoothing in transparent layers on macOS Mojave and later
Modified: tags/Safari-607.1.18.1/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (239677 => 239678)
--- tags/Safari-607.1.18.1/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2019-01-07 17:50:35 UTC (rev 239677)
+++ tags/Safari-607.1.18.1/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm 2019-01-07 17:57:26 UTC (rev 239678)
@@ -1184,7 +1184,7 @@
graphicsContext.setIsCALayerContext(true);
graphicsContext.setIsAcceleratedContext(platformCALayer->acceleratesDrawing());
- if (!layerContents->platformCALayerContentsOpaque() && !platformCALayer->supportsSubpixelAntialiasedText() && FontCascade::isSubpixelAntialiasingAvailable()) {
+ if (!layerContents->platformCALayerContentsOpaque() && !platformCALayer->supportsSubpixelAntialiasedText()) {
// Turn off font smoothing to improve the appearance of text rendered onto a transparent background.
graphicsContext.setShouldSmoothFonts(false);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
