[webkit-changes] [WebKit/WebKit] 7d36e7: [IFC][Ruby] Fix fast/ruby/ruby-expansion-cjk-4.html

[Alan Baradlay]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 7d36e7f1415f2e0f3ee726d8ac784a8c7ac191b1
      https://github.com/WebKit/WebKit/commit/7d36e7f1415f2e0f3ee726d8ac784a8c7ac191b1
  Author: Alan Baradlay <zalan at apple.com>
  Date:   2023-12-13 (Wed, 13 Dec 2023)

  Changed paths:
    M Source/WebCore/layout/formattingContexts/inline/InlineContentAligner.cpp
    M Source/WebCore/layout/formattingContexts/inline/ruby/RubyFormattingContext.cpp

  Log Message:
  -----------
  [IFC][Ruby] Fix fast/ruby/ruby-expansion-cjk-4.html
https://bugs.webkit.org/show_bug.cgi?id=266308

Reviewed by Antti Koivisto.

This change fixes nested ruby bases (e.g. <ruby>base<rt>annotation</rt><ruby>nested base...)
where the nested base would not get aligned properly.

* Source/WebCore/layout/formattingContexts/inline/InlineContentAligner.cpp:
(WebCore::Layout::shiftRubyBaseContentByAlignmentOffset): pass up the accumulated offset to the parent ruby.
(WebCore::Layout::InlineContentAligner::applyRubyBaseAlignmentOffset):
* Source/WebCore/layout/formattingContexts/inline/ruby/RubyFormattingContext.cpp:
(WebCore::Layout::RubyFormattingContext::applyRubyAlignOnBaseContent): do not skip nested ruby bases.

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