[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
rolandsteiner at chromium.org
rolandsteiner at chromium.org
Thu Dec 3 13:40:54 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 55d24085cf978d3b998e013daf2c9c02d2d694f6
Author: rolandsteiner at chromium.org <rolandsteiner at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 20 05:44:06 2009 +0000
2009-11-20 Roland Steiner <rolandsteiner at chromium.org>
WebCore: Change default stylesheet to reset text indentation for ruby elements by default.
(https://bugs.webkit.org/show_bug.cgi?id=31247)
Reviewed by Darin Adler.
Test: fast/ruby/ruby-text-indent.html
* css/html.css: reset text-indent on <ruby> and <rt> elements
LayoutTests: Test checking that CSS 'text-indent' does not affect ruby rendering by default.
(https://bugs.webkit.org/show_bug.cgi?id=31247)
Reviewed by Darin Adler.
* fast/ruby/ruby-text-indent-expected.txt: Added.
* fast/ruby/ruby-text-indent.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51227 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e4b9a56..850bfa9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-20 Roland Steiner <rolandsteiner at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ Test checking that CSS 'text-indent' does not affect ruby rendering by default.
+ (https://bugs.webkit.org/show_bug.cgi?id=31247)
+
+ * fast/ruby/ruby-text-indent-expected.txt: Added.
+ * fast/ruby/ruby-text-indent.html: Added.
+
2009-11-19 Beth Dakin <bdakin at apple.com>
Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/ruby/ruby-text-indent-expected.txt b/LayoutTests/fast/ruby/ruby-text-indent-expected.txt
new file mode 100644
index 0000000..2b4d325
--- /dev/null
+++ b/LayoutTests/fast/ruby/ruby-text-indent-expected.txt
@@ -0,0 +1,11 @@
+This tests that ruby base and text are not affected by CSS text-indent.
+
+This is indented by 50 pixel
+"text-indent: 50px;"
+, but the ruby should flow without extra space.
+
+text-indent for <p>: 50px
+
+text-indent for <ruby>: 0px
+
+text-indent for <rt>: 0px
diff --git a/LayoutTests/fast/ruby/ruby-text-indent.html b/LayoutTests/fast/ruby/ruby-text-indent.html
new file mode 100644
index 0000000..01e0ac6
--- /dev/null
+++ b/LayoutTests/fast/ruby/ruby-text-indent.html
@@ -0,0 +1,28 @@
+<head>
+<script>
+function test()
+{
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ var testp = document.getElementById("p");
+ var testr = document.getElementById("r");
+ var testt = document.getElementById("t");
+ var indentp = window.getComputedStyle(testp, null).getPropertyValue("text-indent");
+ var indentr = window.getComputedStyle(testr, null).getPropertyValue("text-indent");
+ var indentt = window.getComputedStyle(testt, null).getPropertyValue("text-indent");
+ var resultp = document.getElementById("resultp");
+ var resultr = document.getElementById("resultr");
+ var resultt = document.getElementById("resultt");
+ resultp.innerHTML = indentp;
+ resultr.innerHTML = indentr;
+ resultt.innerHTML = indentt;
+}
+</script>
+</head>
+<body onload="test()">
+<p>This tests that ruby base and text are not affected by CSS text-indent.</p>
+<p style="text-indent: 50px" id="p">This is <ruby id="r">indented by 50 pixel<rt id="t">"text-indent: 50px;"</rt></ruby>, but the ruby should flow without extra space.</p>
+<p>text-indent for <p>: <span id="resultp">FAILED!</span></p>
+<p>text-indent for <ruby>: <span id="resultr">FAILED!</span></p>
+<p>text-indent for <rt>: <span id="resultt">FAILED!</span></p>
+</body>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6e80b2a..cde6cd5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-20 Roland Steiner <rolandsteiner at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ Change default stylesheet to reset text indentation for ruby elements by default.
+ (https://bugs.webkit.org/show_bug.cgi?id=31247)
+
+ Test: fast/ruby/ruby-text-indent.html
+
+ * css/html.css: reset text-indent on <ruby> and <rt> elements
+
2009-11-19 Brian Weinstein <bweinstein at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/css/html.css b/WebCore/css/html.css
index c89a000..1132d24 100644
--- a/WebCore/css/html.css
+++ b/WebCore/css/html.css
@@ -609,9 +609,13 @@ a:-webkit-any-link:active {
/* HTML5 ruby elements */
+ruby, rt {
+ text-indent: 0; /* blocks used for ruby rendering should not trigger this */
+}
+
ruby > rt {
display: block;
- font-size: 60%; /* make slightly larger than 50% for better readability */
+ font-size: 60%; /* make slightly larger than 50% for better readability */
text-align: center;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list