[webkit-changes] [WebKit/WebKit] 1e9577: [IFC][Ruby] Use css-ruby to layout ruby content

Alan Baradlay noreply at github.com
Sun Dec 17 06:42:13 PST 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 1e95778ffc9d36edd58063b0984f8dff91874808
      https://github.com/WebKit/WebKit/commit/1e95778ffc9d36edd58063b0984f8dff91874808
  Author: Alan Baradlay <zalan at apple.com>
  Date:   2023-12-17 (Sun, 17 Dec 2023)

  Changed paths:
    M LayoutTests/TestExpectations
    M LayoutTests/fast/ruby/after-doesnt-crash-expected.txt
    M LayoutTests/fast/ruby/assert-with-block-rt-child-and-emphasis-expected.txt
    M LayoutTests/fast/ruby/before-doesnt-crash-expected.txt
    M LayoutTests/fast/ruby/bopomofo-mixed-expected.txt
    M LayoutTests/fast/ruby/float-object-doesnt-crash-expected.txt
    M LayoutTests/fast/ruby/float-overhang-from-ruby-text-expected.txt
    M LayoutTests/fast/ruby/floating-ruby-text-expected.txt
    M LayoutTests/fast/ruby/generated-before-counter-doesnt-crash-expected.txt
    M LayoutTests/fast/ruby/modify-positioned-ruby-text-crash-expected.txt
    M LayoutTests/fast/ruby/overhang-horizontal-expected.txt
    M LayoutTests/fast/ruby/overhang-horizontal-no-overlap1-expected.txt
    M LayoutTests/fast/ruby/overhang-horizontal-no-overlap2-expected.txt
    M LayoutTests/fast/ruby/overhang-vertical-expected.txt
    M LayoutTests/fast/ruby/overhang-vertical-mixed-expected.txt
    M LayoutTests/fast/ruby/overhang-vertical-no-overlap1-expected.txt
    M LayoutTests/fast/ruby/overhang-vertical-no-overlap2-expected.txt
    M LayoutTests/fast/ruby/overhang-vertical-no-overlap2-mixed-expected.txt
    M LayoutTests/fast/ruby/position-after-expected.txt
    M LayoutTests/fast/ruby/positioned-ruby-text-expected.txt
    M LayoutTests/fast/ruby/ruby-base-merge-block-children-crash-2-expected.txt
    M LayoutTests/fast/ruby/ruby-illegal-2-expected.txt
    M LayoutTests/fast/ruby/ruby-illegal-3-expected.txt
    M LayoutTests/fast/ruby/ruby-illegal-7-expected.txt
    M LayoutTests/fast/ruby/ruby-illegal-combined-expected.txt
    M LayoutTests/fast/ruby/ruby-inline-style-not-updated-expected.txt
    M LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt
    M LayoutTests/fast/ruby/ruby-justification-hittest.html
    M LayoutTests/fast/ruby/ruby-text-before-child-split-expected.txt
    M LayoutTests/fast/ruby/rubyDOM-insert-rt-block-1-expected.txt
    M LayoutTests/fast/ruby/rubyDOM-insert-rt-block-2-expected.txt
    M LayoutTests/fast/ruby/rubyDOM-insert-rt-block-3-expected.txt
    M LayoutTests/fast/ruby/rubyDOM-remove-rt-block-1-expected.txt
    M LayoutTests/fast/ruby/rubyDOM-remove-rt-block-2-expected.txt
    M LayoutTests/fast/ruby/rubyDOM-remove-rt-block-3-expected.txt
    M LayoutTests/fast/text/emphasis-avoid-ruby-expected.txt
    M LayoutTests/imported/w3c/web-platform-tests/css/css-ruby/br-clear-all-001-expected.txt
    M LayoutTests/imported/w3c/web-platform-tests/css/css-ruby/br-clear-all-002-expected.txt
    M LayoutTests/imported/w3c/web-platform-tests/editing/run/inserthorizontalrule-expected.txt
    M LayoutTests/imported/w3c/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sans-fieldset-display-expected.txt
    M LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sans-fieldset-display-expected.txt
    M LayoutTests/platform/ios/TestExpectations
    M LayoutTests/platform/ios/fast/css/bidi-override-in-anonymous-block-expected.txt
    M LayoutTests/platform/ios/fast/ruby/base-shorter-than-text-expected.txt
    M LayoutTests/platform/ios/fast/ruby/bopomofo-expected.txt
    M LayoutTests/platform/ios/fast/ruby/bopomofo-letter-spacing-expected.txt
    M LayoutTests/platform/ios/fast/ruby/bopomofo-mixed-expected.txt
    M LayoutTests/platform/ios/fast/ruby/bopomofo-rl-expected.txt
    M LayoutTests/platform/ios/fast/ruby/nested-ruby-expected.txt
    M LayoutTests/platform/ios/fast/ruby/ruby-base-merge-block-children-crash-expected.txt
    M LayoutTests/platform/ios/fast/ruby/ruby-empty-rt-expected.txt
    M LayoutTests/platform/ios/fast/ruby/ruby-simple-expected.txt
    M LayoutTests/platform/ios/fast/ruby/ruby-simple-rp-expected.txt
    M LayoutTests/platform/ios/fast/ruby/ruby-text-before-after-content-expected.txt
    M LayoutTests/platform/ios/fast/ruby/rubyDOM-remove-text2-expected.txt
    M LayoutTests/platform/ios/fast/ruby/select-ruby-expected.txt
    M LayoutTests/platform/ios/fast/writing-mode/japanese-ruby-horizontal-bt-expected.txt
    M LayoutTests/platform/ios/fast/writing-mode/japanese-ruby-vertical-lr-expected.txt
    M LayoutTests/platform/ios/fast/writing-mode/japanese-ruby-vertical-rl-expected.txt
    A LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-ruby/br-clear-all-001-expected.txt
    A LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-ruby/br-clear-all-002-expected.txt
    M LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-ruby/line-spacing-expected.txt
    M LayoutTests/platform/mac/fast/block/lineboxcontain/block-with-ideographs-expected.txt
    M LayoutTests/platform/mac/fast/css/bidi-override-in-anonymous-block-expected.txt
    M LayoutTests/platform/mac/fast/ruby/bopomofo-expected.txt
    M LayoutTests/platform/mac/fast/ruby/bopomofo-letter-spacing-expected.txt
    M LayoutTests/platform/mac/fast/ruby/bopomofo-rl-expected.txt
    M LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.txt
    M LayoutTests/platform/mac/fast/ruby/ruby-base-merge-block-children-crash-expected.txt
    M LayoutTests/platform/mac/fast/ruby/ruby-empty-rt-expected.txt
    M LayoutTests/platform/mac/fast/ruby/ruby-length-expected.txt
    M LayoutTests/platform/mac/fast/ruby/ruby-run-break-expected.txt
    M LayoutTests/platform/mac/fast/ruby/ruby-runs-expected.txt
    M LayoutTests/platform/mac/fast/ruby/ruby-runs-spans-expected.txt
    M LayoutTests/platform/mac/fast/ruby/ruby-simple-expected.txt
    M LayoutTests/platform/mac/fast/ruby/ruby-simple-rp-expected.txt
    M LayoutTests/platform/mac/fast/ruby/ruby-text-before-after-content-expected.txt
    M LayoutTests/platform/mac/fast/ruby/ruby-trailing-expected.txt
    M LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-rt-expected.txt
    M LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-text1-expected.txt
    M LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-text2-expected.txt
    M LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-text3-expected.txt
    M LayoutTests/platform/mac/fast/ruby/rubyDOM-remove-rt1-expected.txt
    M LayoutTests/platform/mac/fast/ruby/rubyDOM-remove-rt2-expected.txt
    M LayoutTests/platform/mac/fast/ruby/rubyDOM-remove-text1-expected.txt
    M LayoutTests/platform/mac/fast/ruby/rubyDOM-remove-text2-expected.txt
    M LayoutTests/platform/mac/fast/ruby/select-ruby-expected.txt
    M LayoutTests/platform/mac/fast/writing-mode/Kusa-Makura-background-canvas-expected.txt
    M LayoutTests/platform/mac/fast/writing-mode/japanese-ruby-horizontal-bt-expected.txt
    M LayoutTests/platform/mac/fast/writing-mode/japanese-ruby-vertical-lr-expected.txt
    M LayoutTests/platform/mac/fast/writing-mode/japanese-ruby-vertical-rl-expected.txt
    M LayoutTests/platform/mac/imported/w3c/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sans-fieldset-display-expected.txt
    M Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml
    M Source/WebCore/style/StyleAdjuster.cpp

  Log Message:
  -----------
  [IFC][Ruby] Use css-ruby to layout ruby content
https://bugs.webkit.org/show_bug.cgi?id=266378

Reviewed by Antti Koivisto.

CSS Ruby generates a whole new set of renderers for ruby content. All existing tree dumps are stale.
(1-2px diffs are also expected)

* LayoutTests/TestExpectations:
* LayoutTests/fast/ruby/after-doesnt-crash-expected.txt:
* LayoutTests/fast/ruby/assert-with-block-rt-child-and-emphasis-expected.txt:
* LayoutTests/fast/ruby/before-doesnt-crash-expected.txt:
* LayoutTests/fast/ruby/bopomofo-mixed-expected.txt:
* LayoutTests/fast/ruby/float-object-doesnt-crash-expected.txt:
* LayoutTests/fast/ruby/float-overhang-from-ruby-text-expected.txt:
* LayoutTests/fast/ruby/floating-ruby-text-expected.txt:
* LayoutTests/fast/ruby/generated-before-counter-doesnt-crash-expected.txt:
* LayoutTests/fast/ruby/modify-positioned-ruby-text-crash-expected.txt:
* LayoutTests/fast/ruby/overhang-horizontal-expected.txt:
* LayoutTests/fast/ruby/overhang-horizontal-no-overlap1-expected.txt:
* LayoutTests/fast/ruby/overhang-horizontal-no-overlap2-expected.txt:
* LayoutTests/fast/ruby/overhang-vertical-expected.txt:
* LayoutTests/fast/ruby/overhang-vertical-mixed-expected.txt:
* LayoutTests/fast/ruby/overhang-vertical-no-overlap1-expected.txt:
* LayoutTests/fast/ruby/overhang-vertical-no-overlap2-expected.txt:
* LayoutTests/fast/ruby/overhang-vertical-no-overlap2-mixed-expected.txt:
* LayoutTests/fast/ruby/position-after-expected.txt:
* LayoutTests/fast/ruby/positioned-ruby-text-expected.txt:
* LayoutTests/fast/ruby/ruby-base-merge-block-children-crash-2-expected.txt:
* LayoutTests/fast/ruby/ruby-illegal-2-expected.txt:
* LayoutTests/fast/ruby/ruby-illegal-3-expected.txt:
* LayoutTests/fast/ruby/ruby-illegal-7-expected.txt:
* LayoutTests/fast/ruby/ruby-illegal-combined-expected.txt:
* LayoutTests/fast/ruby/ruby-inline-style-not-updated-expected.txt:
* LayoutTests/fast/ruby/ruby-justification-hittest-expected.txt:
* LayoutTests/fast/ruby/ruby-justification-hittest.html:
* LayoutTests/fast/ruby/ruby-text-before-child-split-expected.txt:
* LayoutTests/fast/ruby/rubyDOM-insert-rt-block-1-expected.txt:
* LayoutTests/fast/ruby/rubyDOM-insert-rt-block-2-expected.txt:
* LayoutTests/fast/ruby/rubyDOM-insert-rt-block-3-expected.txt:
* LayoutTests/fast/ruby/rubyDOM-remove-rt-block-1-expected.txt:
* LayoutTests/fast/ruby/rubyDOM-remove-rt-block-2-expected.txt:
* LayoutTests/fast/ruby/rubyDOM-remove-rt-block-3-expected.txt:
* LayoutTests/fast/text/emphasis-avoid-ruby-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-ruby/br-clear-all-001-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/css/css-ruby/br-clear-all-002-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/editing/run/inserthorizontalrule-expected.txt:
* LayoutTests/imported/w3c/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sans-fieldset-display-expected.txt:
* LayoutTests/platform/ios-wk2/imported/w3c/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sans-fieldset-display-expected.txt:
* LayoutTests/platform/ios/TestExpectations:
* LayoutTests/platform/ios/fast/css/bidi-override-in-anonymous-block-expected.txt:
* LayoutTests/platform/ios/fast/ruby/base-shorter-than-text-expected.txt:
* LayoutTests/platform/ios/fast/ruby/bopomofo-expected.txt:
* LayoutTests/platform/ios/fast/ruby/bopomofo-letter-spacing-expected.txt:
* LayoutTests/platform/ios/fast/ruby/bopomofo-mixed-expected.txt:
* LayoutTests/platform/ios/fast/ruby/bopomofo-rl-expected.txt:
* LayoutTests/platform/ios/fast/ruby/nested-ruby-expected.txt:
* LayoutTests/platform/ios/fast/ruby/ruby-base-merge-block-children-crash-expected.txt:
* LayoutTests/platform/ios/fast/ruby/ruby-empty-rt-expected.txt:
* LayoutTests/platform/ios/fast/ruby/ruby-simple-expected.txt:
* LayoutTests/platform/ios/fast/ruby/ruby-simple-rp-expected.txt:
* LayoutTests/platform/ios/fast/ruby/ruby-text-before-after-content-expected.txt:
* LayoutTests/platform/ios/fast/ruby/rubyDOM-remove-text2-expected.txt:
* LayoutTests/platform/ios/fast/ruby/select-ruby-expected.txt:
* LayoutTests/platform/ios/fast/writing-mode/japanese-ruby-horizontal-bt-expected.txt:
* LayoutTests/platform/ios/fast/writing-mode/japanese-ruby-vertical-lr-expected.txt:
* LayoutTests/platform/ios/fast/writing-mode/japanese-ruby-vertical-rl-expected.txt:
* LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-ruby/br-clear-all-001-expected.txt: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-ruby/br-clear-all-001-expected.txt.
* LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-ruby/br-clear-all-002-expected.txt: Copied from LayoutTests/imported/w3c/web-platform-tests/css/css-ruby/br-clear-all-002-expected.txt.
* LayoutTests/platform/ios/imported/w3c/web-platform-tests/css/css-ruby/line-spacing-expected.txt:
* LayoutTests/platform/mac/fast/block/lineboxcontain/block-with-ideographs-expected.txt:
* LayoutTests/platform/mac/fast/css/bidi-override-in-anonymous-block-expected.txt:
* LayoutTests/platform/mac/fast/ruby/bopomofo-expected.txt:
* LayoutTests/platform/mac/fast/ruby/bopomofo-letter-spacing-expected.txt:
* LayoutTests/platform/mac/fast/ruby/bopomofo-rl-expected.txt:
* LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.txt:
* LayoutTests/platform/mac/fast/ruby/ruby-base-merge-block-children-crash-expected.txt:
* LayoutTests/platform/mac/fast/ruby/ruby-empty-rt-expected.txt:
* LayoutTests/platform/mac/fast/ruby/ruby-length-expected.txt:
* LayoutTests/platform/mac/fast/ruby/ruby-run-break-expected.txt:
* LayoutTests/platform/mac/fast/ruby/ruby-runs-expected.txt:
* LayoutTests/platform/mac/fast/ruby/ruby-runs-spans-expected.txt:
* LayoutTests/platform/mac/fast/ruby/ruby-simple-expected.txt:
* LayoutTests/platform/mac/fast/ruby/ruby-simple-rp-expected.txt:
* LayoutTests/platform/mac/fast/ruby/ruby-text-before-after-content-expected.txt:
* LayoutTests/platform/mac/fast/ruby/ruby-trailing-expected.txt:
* LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-rt-expected.txt:
* LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-text1-expected.txt:
* LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-text2-expected.txt:
* LayoutTests/platform/mac/fast/ruby/rubyDOM-insert-text3-expected.txt:
* LayoutTests/platform/mac/fast/ruby/rubyDOM-remove-rt1-expected.txt:
* LayoutTests/platform/mac/fast/ruby/rubyDOM-remove-rt2-expected.txt:
* LayoutTests/platform/mac/fast/ruby/rubyDOM-remove-text1-expected.txt:
* LayoutTests/platform/mac/fast/ruby/rubyDOM-remove-text2-expected.txt:
* LayoutTests/platform/mac/fast/ruby/select-ruby-expected.txt:
* LayoutTests/platform/mac/fast/writing-mode/Kusa-Makura-background-canvas-expected.txt:
* LayoutTests/platform/mac/fast/writing-mode/japanese-ruby-horizontal-bt-expected.txt:
* LayoutTests/platform/mac/fast/writing-mode/japanese-ruby-vertical-lr-expected.txt:
* LayoutTests/platform/mac/fast/writing-mode/japanese-ruby-vertical-rl-expected.txt:
* LayoutTests/platform/mac/imported/w3c/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-sans-fieldset-display-expected.txt:
* Source/WTF/Scripts/Preferences/UnifiedWebPreferences.yaml:
* Source/WebCore/style/StyleAdjuster.cpp:
(WebCore::Style::Adjuster::adjust const):
(WebCore::Style::disableStyleBasedRubyIfNeeded): Deleted.

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




More information about the webkit-changes mailing list