[webkit-changes] [WebKit/WebKit] 1a78cf: FontMetrics's ascent/descent/lineGap/lineSpacing s...

Alan Baradlay noreply at github.com
Mon Feb 19 06:39:28 PST 2024


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 1a78cf12c8f5ff2e296f7eb25ff4bcbc86cfbfe8
      https://github.com/WebKit/WebKit/commit/1a78cf12c8f5ff2e296f7eb25ff4bcbc86cfbfe8
  Author: Alan Baradlay <zalan at apple.com>
  Date:   2024-02-19 (Mon, 19 Feb 2024)

  Changed paths:
    M Source/WebCore/inspector/InspectorOverlayLabel.cpp
    M Source/WebCore/layout/formattingContexts/inline/InlineLevelBox.h
    M Source/WebCore/platform/graphics/Font.cpp
    M Source/WebCore/platform/graphics/FontMetrics.h
    M Source/WebCore/platform/graphics/PositionedGlyphs.cpp
    M Source/WebCore/platform/graphics/coretext/DrawGlyphsRecorderCoreText.cpp
    M Source/WebCore/platform/graphics/coretext/FontCascadeCoreText.cpp
    M Source/WebCore/rendering/TextBoxPainter.cpp
    M Source/WebCore/rendering/svg/RenderSVGInlineText.cpp
    M Source/WebCore/rendering/svg/SVGInlineTextBox.cpp
    M Source/WebCore/rendering/svg/SVGTextLayoutEngineBaseline.cpp
    M Source/WebCore/rendering/svg/SVGTextQuery.cpp
    M Source/WebCore/style/InlineTextBoxStyle.cpp

  Log Message:
  -----------
  FontMetrics's ascent/descent/lineGap/lineSpacing should all just return float
https://bugs.webkit.org/show_bug.cgi?id=269687

Reviewed by Antti Koivisto.

This patch reverts signatures to what we had prior to 274662 at main.

1. intAscent/intDecent/... functions don't return optional either (inconsistent)
2. none of these values are supposed to be optional (i.e. always set)
3. clients wouldn't really know what to do with this unexpected "not-contained" state

This is in preparation for migrating IFC use non-integral FontMetrics APIs.

* Source/WebCore/inspector/InspectorOverlayLabel.cpp:
(WebCore::InspectorOverlayLabel::draw):
* Source/WebCore/layout/formattingContexts/inline/InlineLevelBox.h:
(WebCore::Layout::InlineLevelBox::preferredLineHeight const):
* Source/WebCore/platform/graphics/Font.cpp:
(WebCore::Font::initCharWidths):
(WebCore::Font::platformGlyphInit):
* Source/WebCore/platform/graphics/FontMetrics.h:
(WebCore::FontMetrics::height const):
(WebCore::FontMetrics::ascent const):
(WebCore::FontMetrics::descent const):
(WebCore::FontMetrics::lineGap const):
(WebCore::FontMetrics::lineSpacing const):
* Source/WebCore/platform/graphics/PositionedGlyphs.cpp:
(WebCore::PositionedGlyphs::computeBounds const):
* Source/WebCore/platform/graphics/coretext/DrawGlyphsRecorderCoreText.cpp:
(WebCore::DrawGlyphsRecorder::recordDrawGlyphs):
* Source/WebCore/platform/graphics/coretext/FontCascadeCoreText.cpp:
(WebCore::showGlyphsWithAdvances):
* Source/WebCore/rendering/TextBoxPainter.cpp:
(WebCore::computedLinethroughCenter):
* Source/WebCore/rendering/svg/RenderSVGInlineText.cpp:
(WebCore::RenderSVGInlineText::positionForPoint):
* Source/WebCore/rendering/svg/SVGInlineTextBox.cpp:
(WebCore::SVGInlineTextBox::selectionRectForTextFragment const):
(WebCore::positionOffsetForDecoration):
(WebCore::SVGInlineTextBox::paintDecorationWithStyle):
(WebCore::SVGInlineTextBox::paintTextWithShadows):
(WebCore::SVGInlineTextBox::calculateBoundaries const):
(WebCore::SVGInlineTextBox::nodeAtPoint):
* Source/WebCore/rendering/svg/SVGTextLayoutEngineBaseline.cpp:
(WebCore::SVGTextLayoutEngineBaseline::calculateAlignmentBaselineShift const):
(WebCore::SVGTextLayoutEngineBaseline::calculateGlyphAdvanceAndOrientation const):
* Source/WebCore/rendering/svg/SVGTextQuery.cpp:
(WebCore::calculateGlyphBoundaries):
(WebCore::calculateFragmentBoundaries):
* Source/WebCore/style/InlineTextBoxStyle.cpp:
(WebCore::computedVisualOverflowForDecorations):

Canonical link: https://commits.webkit.org/274976@main



To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications


More information about the webkit-changes mailing list