[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hyatt at apple.com
hyatt at apple.com
Wed Dec 22 16:09:23 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b011109f811e2f5febdb5458234038fde0dd9cb4
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 19 01:33:33 2010 +0000
https://bugs.webkit.org/show_bug.cgi?id=49772
Reviewed by Dan Bernstein.
Fix nested ruby. My previous checkin (for 49717) broke it. Push the ruby text and ruby base text
together based off logicalTopOverflow and logicalBottomOverflow rather than lineTop and lineBottom.
This way the overflow from nested rubies is accounted for.
Added fast/ruby/nested-ruby.html
WebCore:
* rendering/RenderRubyRun.cpp:
(WebCore::RenderRubyRun::layout):
LayoutTests:
* fast/ruby/nested-ruby.html: Added.
* platform/mac/fast/ruby/nested-ruby-expected.checksum: Added.
* platform/mac/fast/ruby/nested-ruby-expected.png: Added.
* platform/mac/fast/ruby/nested-ruby-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72355 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9379bdd..6468bf6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-11-18 Dave Hyatt <hyatt at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ https://bugs.webkit.org/show_bug.cgi?id=49772
+
+ Fix nested ruby. My previous checkin (for 49717) broke it. Push the ruby text and ruby base text
+ together based off logicalTopOverflow and logicalBottomOverflow rather than lineTop and lineBottom.
+ This way the overflow from nested rubies is accounted for.
+
+ Added fast/ruby/nested-ruby.html
+
+ * fast/ruby/nested-ruby.html: Added.
+ * platform/mac/fast/ruby/nested-ruby-expected.checksum: Added.
+ * platform/mac/fast/ruby/nested-ruby-expected.png: Added.
+ * platform/mac/fast/ruby/nested-ruby-expected.txt: Added.
+
2010-11-18 Alexey Proskuryakov <ap at apple.com>
Updating test results. I don't know what this mega-test is doing, but at least they changed
diff --git a/LayoutTests/fast/ruby/nested-ruby.html b/LayoutTests/fast/ruby/nested-ruby.html
new file mode 100644
index 0000000..5c95885
--- /dev/null
+++ b/LayoutTests/fast/ruby/nested-ruby.html
@@ -0,0 +1,4 @@
+<head>
+<meta charset="utf-8">
+</head>
+<p class="callout"><ruby lang="ja-latn"><ruby lang="ja">攻<rp>（</rp><rt>こう</rt><rp>）</rp>殻<rp>（</rp><rt>かく</rt><rp>）</rp>機<rp>（</rp><rt>き</rt><rp>）</rp>動<rp>（</rp><rt>どう</rt><rp>）</rp>隊<rp>（</rp><rt>たい</rt><rp>）</rp></ruby><rp>（</rp><rt>Kōkakukidōtai</rt><rp>）</rp></ruby></p>
diff --git a/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.checksum b/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.checksum
new file mode 100644
index 0000000..1dadddb
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.checksum
@@ -0,0 +1 @@
+c32f03fb9faea7db71d9ee712e7a4655
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.png b/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.png
new file mode 100644
index 0000000..17f1fc4
Binary files /dev/null and b/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.txt b/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.txt
new file mode 100644
index 0000000..a49d589
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/ruby/nested-ruby-expected.txt
@@ -0,0 +1,48 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x576
+ RenderBlock {P} at (0,0) size 784x44
+ RenderRuby (inline) {RUBY} at (0,0) size 96x18
+ RenderRubyRun (anonymous) at (0,13) size 96x31
+ RenderRubyText {RT} at (0,-13) size 96x13
+ RenderText {#text} at (18,0) size 59x13
+ text run at (18,0) width 59: "K\x{14D}kakukid\x{14D}tai"
+ RenderRubyBase (anonymous) at (0,0) size 96x31
+ RenderRuby (inline) {RUBY} at (0,0) size 96x18
+ RenderRubyRun (anonymous) at (0,13) size 20x18
+ RenderRubyText {RT} at (0,-13) size 20x13
+ RenderText {#text} at (0,0) size 20x13
+ text run at (0,0) width 20: "\x{3053}\x{3046}"
+ RenderRubyBase (anonymous) at (0,0) size 20x18
+ RenderText {#text} at (2,0) size 16x18
+ text run at (2,0) width 16: "\x{653B}"
+ RenderRubyRun (anonymous) at (20,13) size 20x18
+ RenderRubyText {RT} at (0,-13) size 20x13
+ RenderText {#text} at (0,0) size 20x13
+ text run at (0,0) width 20: "\x{304B}\x{304F}"
+ RenderRubyBase (anonymous) at (0,0) size 20x18
+ RenderText {#text} at (2,0) size 16x18
+ text run at (2,0) width 16: "\x{6BBB}"
+ RenderRubyRun (anonymous) at (40,13) size 16x18
+ RenderRubyText {RT} at (0,-13) size 16x13
+ RenderText {#text} at (3,0) size 10x13
+ text run at (3,0) width 10: "\x{304D}"
+ RenderRubyBase (anonymous) at (0,0) size 16x18
+ RenderText {#text} at (0,0) size 16x18
+ text run at (0,0) width 16: "\x{6A5F}"
+ RenderRubyRun (anonymous) at (56,13) size 20x18
+ RenderRubyText {RT} at (0,-13) size 20x13
+ RenderText {#text} at (0,0) size 20x13
+ text run at (0,0) width 20: "\x{3069}\x{3046}"
+ RenderRubyBase (anonymous) at (0,0) size 20x18
+ RenderText {#text} at (2,0) size 16x18
+ text run at (2,0) width 16: "\x{52D5}"
+ RenderRubyRun (anonymous) at (76,13) size 20x18
+ RenderRubyText {RT} at (0,-13) size 20x13
+ RenderText {#text} at (0,0) size 20x13
+ text run at (0,0) width 20: "\x{305F}\x{3044}"
+ RenderRubyBase (anonymous) at (0,0) size 20x18
+ RenderText {#text} at (2,0) size 16x18
+ text run at (2,0) width 16: "\x{968A}"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0c785dd..0b54b2b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-18 Dave Hyatt <hyatt at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ https://bugs.webkit.org/show_bug.cgi?id=49772
+
+ Fix nested ruby. My previous checkin (for 49717) broke it. Push the ruby text and ruby base text
+ together based off logicalTopOverflow and logicalBottomOverflow rather than lineTop and lineBottom.
+ This way the overflow from nested rubies is accounted for.
+
+ Added fast/ruby/nested-ruby.html
+
+ * rendering/RenderRubyRun.cpp:
+ (WebCore::RenderRubyRun::layout):
+
2010-11-18 Kinuko Yasuda <kinuko at chromium.org>
Reviewed by Nate Chapin.
diff --git a/WebCore/rendering/RenderRubyRun.cpp b/WebCore/rendering/RenderRubyRun.cpp
index a6d6ba0..5c92c04 100644
--- a/WebCore/rendering/RenderRubyRun.cpp
+++ b/WebCore/rendering/RenderRubyRun.cpp
@@ -250,8 +250,8 @@ void RenderRubyRun::layout()
RootInlineBox* rootBox = rt->lastRootBox();
if (rootBox) {
// In order to align, we have to ignore negative leading.
- firstLineRubyTextTop = rt->firstRootBox()->lineTop();
- lastLineRubyTextBottom = rootBox->lineBottom();
+ firstLineRubyTextTop = rt->firstRootBox()->logicalTopLayoutOverflow();
+ lastLineRubyTextBottom = rootBox->logicalBottomLayoutOverflow();
}
if (!style()->isFlippedLinesWritingMode()) {
@@ -259,7 +259,7 @@ void RenderRubyRun::layout()
if (RenderRubyBase* rb = rubyBase()) {
RootInlineBox* rootBox = rb->firstRootBox();
if (rootBox)
- firstLineTop = rootBox->lineTop();
+ firstLineTop = rootBox->logicalTopLayoutOverflow();
firstLineTop += rb->logicalTop();
}
@@ -269,7 +269,7 @@ void RenderRubyRun::layout()
if (RenderRubyBase* rb = rubyBase()) {
RootInlineBox* rootBox = rb->lastRootBox();
if (rootBox)
- lastLineBottom = rootBox->lineBottom();
+ lastLineBottom = rootBox->logicalBottomLayoutOverflow();
lastLineBottom += rb->logicalTop();
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list