Diff
Modified: trunk/Source/WebCore/ChangeLog (282920 => 282921)
--- trunk/Source/WebCore/ChangeLog 2021-09-23 04:30:49 UTC (rev 282920)
+++ trunk/Source/WebCore/ChangeLog 2021-09-23 04:48:59 UTC (rev 282921)
@@ -1,3 +1,19 @@
+2021-09-22 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Rename the Shaping log channel to TextShaping
+ https://bugs.webkit.org/show_bug.cgi?id=230665
+
+ Reviewed by Simon Fraser.
+
+ No new tests because there is no behavior change.
+
+ * platform/Logging.h:
+ * platform/graphics/coretext/FontCoreText.cpp:
+ (WebCore::Font::applyTransforms const):
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+ (WebCore::ComplexTextController::ComplexTextRun::ComplexTextRun):
+ (WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
+
2021-09-22 Wenson Hsieh <wenson_hs...@apple.com>
Turn WebCore::LineCap and WebCore::LineJoin into 8-bit enum classes
Modified: trunk/Source/WebCore/platform/Logging.h (282920 => 282921)
--- trunk/Source/WebCore/platform/Logging.h 2021-09-23 04:30:49 UTC (rev 282920)
+++ trunk/Source/WebCore/platform/Logging.h 2021-09-23 04:48:59 UTC (rev 282921)
@@ -107,7 +107,6 @@
M(Selection) \
M(Services) \
M(ServiceWorker) \
- M(Shaping) \
M(SpellingAndGrammar) \
M(SQLDatabase) \
M(Storage) \
@@ -115,6 +114,7 @@
M(StyleSheets) \
M(SVG) \
M(TextAutosizing) \
+ M(TextShaping) \
M(Tiling) \
M(Threading) \
M(URLParser) \
Modified: trunk/Source/WebCore/platform/graphics/coretext/FontCoreText.cpp (282920 => 282921)
--- trunk/Source/WebCore/platform/graphics/coretext/FontCoreText.cpp 2021-09-23 04:30:49 UTC (rev 282920)
+++ trunk/Source/WebCore/platform/graphics/coretext/FontCoreText.cpp 2021-09-23 04:48:59 UTC (rev 282921)
@@ -605,10 +605,10 @@
range.length = std::min(range.location, -range.length);
range.location = range.location - range.length;
glyphBuffer.remove(beginningGlyphIndex + range.location, range.length);
- LOG_WITH_STREAM(Shaping, stream << "Callback called to remove at location " << range.location << " and length " << range.length);
+ LOG_WITH_STREAM(TextShaping, stream << "Callback called to remove at location " << range.location << " and length " << range.length);
} else {
glyphBuffer.makeHole(beginningGlyphIndex + range.location, range.length, this);
- LOG_WITH_STREAM(Shaping, stream << "Callback called to insert hole at location " << range.location << " and length " << range.length);
+ LOG_WITH_STREAM(TextShaping, stream << "Callback called to insert hole at location " << range.location << " and length " << range.length);
}
*newGlyphsPointer = glyphBuffer.glyphs(beginningGlyphIndex);
@@ -629,7 +629,7 @@
for (unsigned i = 0; i < glyphBuffer.size() - beginningGlyphIndex; ++i)
glyphBuffer.offsetsInString(beginningGlyphIndex)[i] -= beginningStringIndex;
- LOG_WITH_STREAM(Shaping,
+ LOG_WITH_STREAM(TextShaping,
stream << "Simple shaping " << numberOfInputGlyphs << " glyphs in font " << String(adoptCF(CTFontCopyPostScriptName(m_platformData.ctFont())).get()) << ".\n";
const auto* glyphs = glyphBuffer.glyphs(beginningGlyphIndex);
stream << "Glyphs:";
@@ -669,7 +669,7 @@
localeString.get(),
handler);
- LOG_WITH_STREAM(Shaping,
+ LOG_WITH_STREAM(TextShaping,
stream << "Shaping result: " << glyphBuffer.size() - beginningGlyphIndex << " glyphs.\n";
const auto* glyphs = glyphBuffer.glyphs(beginningGlyphIndex);
stream << "Glyphs:";
Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (282920 => 282921)
--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2021-09-23 04:30:49 UTC (rev 282920)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2021-09-23 04:48:59 UTC (rev 282921)
@@ -90,7 +90,7 @@
m_baseAdvances.uncheckedAppend(baseAdvances[i]);
}
- LOG_WITH_STREAM(Shaping,
+ LOG_WITH_STREAM(TextShaping,
stream << "Shaping result: " << m_glyphCount << " glyphs.\n";
stream << "Glyphs:";
for (unsigned i = 0; i < m_glyphCount; ++i)
@@ -161,7 +161,7 @@
RetainPtr<CTLineRef> line;
- LOG_WITH_STREAM(Shaping,
+ LOG_WITH_STREAM(TextShaping,
stream << "Complex shaping " << length << " code units with info " << String(adoptCF(CFCopyDescription(stringAttributes.get())).get()) << ".\n";
stream << "Code Units:";
for (unsigned i = 0; i < length; ++i)
@@ -187,11 +187,11 @@
if (!typesetter)
return;
- LOG_WITH_STREAM(Shaping, stream << "Forcing " << (m_run.ltr() ? "ltr" : "rtl"));
+ LOG_WITH_STREAM(TextShaping, stream << "Forcing " << (m_run.ltr() ? "ltr" : "rtl"));
line = adoptCF(CTTypesetterCreateLine(typesetter.get(), CFRangeMake(0, 0)));
} else {
- LOG_WITH_STREAM(Shaping, stream << "Not forcing direction");
+ LOG_WITH_STREAM(TextShaping, stream << "Not forcing direction");
ProviderInfo info = { cp, length, stringAttributes.get() };
@@ -210,7 +210,7 @@
CFIndex runCount = CFArrayGetCount(runArray);
- LOG_WITH_STREAM(Shaping, stream << "Result: " << runCount << " runs.");
+ LOG_WITH_STREAM(TextShaping, stream << "Result: " << runCount << " runs.");
for (CFIndex r = 0; r < runCount; r++) {
CTRunRef ctRun = static_cast<CTRunRef>(CFArrayGetValueAtIndex(runArray, m_run.ltr() ? r : runCount - 1 - r));
@@ -250,7 +250,7 @@
if (m_fallbackFonts && runFont != &m_font.primaryFont())
m_fallbackFonts->add(font);
- LOG_WITH_STREAM(Shaping, stream << "Run " << r << ":");
+ LOG_WITH_STREAM(TextShaping, stream << "Run " << r << ":");
m_complexTextRuns.append(ComplexTextRun::create(ctRun, *runFont, cp, stringLocation, length, runRange.location, runRange.location + runRange.length));
}
