Title: [280124] trunk/Source
Revision
280124
Author
[email protected]
Date
2021-07-20 21:23:21 -0700 (Tue, 20 Jul 2021)

Log Message

r280103 is not necessary on all operating systems
https://bugs.webkit.org/show_bug.cgi?id=228136

Reviewed by Alan Bujtas.

Source/WebCore:

r280103 is not necessary on all operating systems.

No new tests because there is no behavior change.

* platform/graphics/WidthIterator.cpp:
(WebCore::WidthIterator::applyFontTransforms):

Source/WTF:

* wtf/PlatformUse.h:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (280123 => 280124)


--- trunk/Source/WTF/ChangeLog	2021-07-21 03:33:43 UTC (rev 280123)
+++ trunk/Source/WTF/ChangeLog	2021-07-21 04:23:21 UTC (rev 280124)
@@ -1,3 +1,12 @@
+2021-07-20  Myles C. Maxfield  <[email protected]>
+
+        r280103 is not necessary on all operating systems
+        https://bugs.webkit.org/show_bug.cgi?id=228136
+
+        Reviewed by Alan Bujtas.
+
+        * wtf/PlatformUse.h:
+
 2021-07-16  Alexander Mikhaylenko  <[email protected]>
 
         [GTK][WPE] Support color-schemes CSS property

Modified: trunk/Source/WTF/wtf/PlatformUse.h (280123 => 280124)


--- trunk/Source/WTF/wtf/PlatformUse.h	2021-07-21 03:33:43 UTC (rev 280123)
+++ trunk/Source/WTF/wtf/PlatformUse.h	2021-07-21 04:23:21 UTC (rev 280124)
@@ -305,6 +305,13 @@
 #define USE_CTFONTGETADVANCES_WORKAROUND 1
 #endif
 
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 130000) \
+    || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 160000) \
+    || (PLATFORM(WATCHOS) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __WATCH_OS_VERSION_MIN_REQUIRED < 90000) \
+    || (PLATFORM(APPLETV) && !PLATFORM(IOS_FAMILY_SIMULATOR) && __TV_OS_VERSION_MIN_REQUIRED < 160000)
+#define USE_CTFONTSHAPEGLYPHS_WORKAROUND 1
+#endif
+
 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
 #define USE_LEGACY_CFNETWORK_DOWNLOADS 1
 #endif

Modified: trunk/Source/WebCore/ChangeLog (280123 => 280124)


--- trunk/Source/WebCore/ChangeLog	2021-07-21 03:33:43 UTC (rev 280123)
+++ trunk/Source/WebCore/ChangeLog	2021-07-21 04:23:21 UTC (rev 280124)
@@ -1,3 +1,17 @@
+2021-07-20  Myles C. Maxfield  <[email protected]>
+
+        r280103 is not necessary on all operating systems
+        https://bugs.webkit.org/show_bug.cgi?id=228136
+
+        Reviewed by Alan Bujtas.
+
+        r280103 is not necessary on all operating systems.
+
+        No new tests because there is no behavior change.
+
+        * platform/graphics/WidthIterator.cpp:
+        (WebCore::WidthIterator::applyFontTransforms):
+
 2021-07-20  Said Abou-Hallawa  <[email protected]>
 
         Make the 'targetElement' argument of the SVG animators to be a reference

Modified: trunk/Source/WebCore/platform/graphics/WidthIterator.cpp (280123 => 280124)


--- trunk/Source/WebCore/platform/graphics/WidthIterator.cpp	2021-07-21 03:33:43 UTC (rev 280123)
+++ trunk/Source/WebCore/platform/graphics/WidthIterator.cpp	2021-07-21 04:23:21 UTC (rev 280124)
@@ -107,10 +107,10 @@
 
     font.applyTransforms(glyphBuffer, lastGlyphCount, m_currentCharacterIndex, m_enableKerning, m_requiresShaping, m_font.fontDescription().computedLocale(), m_run.text(), m_run.direction());
 
+#if USE(CTFONTSHAPEGLYPHS_WORKAROUND)
     // <rdar://problem/80798113>: If a character is not in BMP, and we don't have a glyph for it,
     // we'll end up with two 0 glyphs in a row for the two surrogates of the character.
     // We need to make sure that, after shaping, these double-0-glyphs aren't preserved.
-    // FIXME: Delete this when rdar://80818297 is fixed everywhere.
     if (&font == &m_font.primaryFont() && !m_run.text().is8Bit()) {
         for (unsigned i = 0; i < glyphBuffer.size() - 1; ++i) {
             if (!glyphBuffer.glyphAt(i) && !glyphBuffer.glyphAt(i + 1)) {
@@ -125,6 +125,7 @@
             }
         }
     }
+#endif
 
     glyphBufferSize = glyphBuffer.size();
     advances = glyphBuffer.advances(0);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to