[Ruby] Do not apply annotation overhang when ruby-overhang is none

alanbaradlay · alanbaradlay · commit 71ad05bf4394 · 2024-08-30T18:10:17.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=278893 Reviewed by Antti Koivisto. * Source/WebCore/layout/formattingContexts/inline/ruby/RubyFormattingContext.cpp: (WebCore::Layout::RubyFormattingContext::applyRubyOverhang): Canonical link: https://commits.webkit.org/283005@main
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-ruby/ruby-overhang-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-ruby/ruby-overhang-expected.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>Tests for ruby-overhang: none</title>
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+  div {
+    font: 16px/5 Ahem;    
+  }
+  span {
+    color: transparent;
+    font-size: 8px; /* annotation -> 50% */
+  }
+</style>
+<div>X<span>XXX</span>X</div>
+<div>X<span>XXXX</span>X</div>
+<div>X<span>XXXX</span>X</div>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-ruby/ruby-overhang-ref.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-ruby/ruby-overhang-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>Tests for ruby-overhang: none</title>
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+  div {
+    font: 16px/5 Ahem;    
+  }
+  span {
+    color: transparent;
+    font-size: 8px; /* annotation -> 50% */
+  }
+</style>
+<div>X<span>XXX</span>X</div>
+<div>X<span>XXXX</span>X</div>
+<div>X<span>XXXX</span>X</div>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-ruby/ruby-overhang.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-ruby/ruby-overhang.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>Tests for ruby-overhang: none</title>
+<link rel="help" href="https://drafts.csswg.org/css-ruby-1/#ruby-overhang">
+<link rel="match" href="ruby-overhang-ref.html">
+<link rel="stylesheet" href="/fonts/ahem.css">
+<style>
+  div {
+    font: 16px/5 Ahem;    
+  }
+  ruby, rt {
+    color: transparent;
+  }
+</style>
+<div>X<ruby>X<rt>XXXX</rt></ruby>X</div>
+<div>X<ruby style="ruby-overhang: none">X<rt>XXXX</rt></ruby>X</div>
+<div style="ruby-overhang: none">X<ruby>X<rt>XXXX</rt></ruby>X</div>
diff --git a/Source/WebCore/layout/formattingContexts/inline/ruby/RubyFormattingContext.cpp b/Source/WebCore/layout/formattingContexts/inline/ruby/RubyFormattingContext.cpp
@@ -619,6 +619,8 @@ void RubyFormattingContext::applyRubyOverhang(InlineFormattingContext& parentFor
         auto& rubyBaseLayoutBox = displayBoxes[rubyBaseStart].layoutBox();
         ASSERT(rubyBaseLayoutBox.isRubyBase());
         ASSERT(hasInterlinearAnnotation(rubyBaseLayoutBox));
+        if (rubyBaseLayoutBox.style().rubyOverhang() == RubyOverhang::None)
+            continue;
 
         auto beforeOverhang = overhangForAnnotationBefore(rubyBaseLayoutBox, rubyBaseStart, displayBoxes, lineLogicalHeight, parentFormattingContext);
         auto afterOverhang = overhangForAnnotationAfter(rubyBaseLayoutBox, { rubyBaseStart, startEndPair.end() }, displayBoxes, lineLogicalHeight, parentFormattingContext);
