[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8
rolandsteiner at chromium.org
rolandsteiner at chromium.org
Wed Feb 10 22:10:39 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 18164f25033ce8d40ed7a0231dd301e37560a840
Author: rolandsteiner at chromium.org <rolandsteiner at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 3 05:57:13 2010 +0000
Bug 34198 - Ruby text should not inherit line-height
(https://bugs.webkit.org/show_bug.cgi?id=34198)
Reviewed by Adele Peterson.
Resetting line-height to 'normal' in the default UA style sheet.
Adding layout-test to check for this.
WebCore:
Test: fast/ruby/ruby-line-height.html
* css/html.css:
LayoutTests:
* fast/ruby/script-tests: Added.
* fast/ruby/script-tests/ruby-line-height.js: Added.
* fast/ruby/ruby-line-height-expected.txt: Added.
* fast/ruby/ruby-line-height.html: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54273 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 53f0efb..6b29a9c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-02 Roland Steiner <rolandsteiner at chromium.org>
+
+ Reviewed by Adele Peterson.
+
+ Bug 34198 - Ruby text should not inherit line-height
+ (https://bugs.webkit.org/show_bug.cgi?id=34198)
+
+ Resetting line-height to 'normal' in the default UA style sheet.
+ Adding layout-test to check for this.
+
+ * fast/ruby/script-tests: Added.
+ * fast/ruby/script-tests/ruby-line-height.js: Added.
+ * fast/ruby/ruby-line-height-expected.txt: Added.
+ * fast/ruby/ruby-line-height.html: Added.
+
2010-02-02 Kent Tamura <tkent at chromium.org>
Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/ruby/ruby-line-height-expected.txt b/LayoutTests/fast/ruby/ruby-line-height-expected.txt
new file mode 100644
index 0000000..a8411c2
--- /dev/null
+++ b/LayoutTests/fast/ruby/ruby-line-height-expected.txt
@@ -0,0 +1,17 @@
+Test that the CSS property 'line-height' is not applied to ruby base and annotation texts.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS [object HTMLParagraphElement] is non-null.
+PASS getLineHeight('p') is "48px"
+PASS [object HTMLElement] is non-null.
+PASS getLineHeight('r') is "normal"
+PASS [object HTMLElement] is non-null.
+PASS getLineHeight('t') is "normal"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+The line height of this is three times normal
+"line-height: 48px;"
+, but the ruby should have 'line-height: normal'.
diff --git a/LayoutTests/fast/ruby/ruby-line-height.html b/LayoutTests/fast/ruby/ruby-line-height.html
new file mode 100644
index 0000000..323b2d1
--- /dev/null
+++ b/LayoutTests/fast/ruby/ruby-line-height.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<script src="script-tests/ruby-line-height.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/LayoutTests/fast/ruby/script-tests/ruby-line-height.js b/LayoutTests/fast/ruby/script-tests/ruby-line-height.js
new file mode 100644
index 0000000..7493887
--- /dev/null
+++ b/LayoutTests/fast/ruby/script-tests/ruby-line-height.js
@@ -0,0 +1,19 @@
+description("Test that the CSS property 'line-height' is not applied to ruby base and annotation texts.");
+
+function getLineHeight(id)
+{
+ var element = document.getElementById(id);
+ shouldBeNonNull(element);
+ var lineHeight = window.getComputedStyle(element, null).getPropertyValue("line-height");
+ return lineHeight;
+}
+
+var div = document.createElement("div");
+div.innerHTML = "<p style='line-height: 300%' id='p'>The line height of this is <ruby id='r'>three times normal<rt id='t'>"line-height: 48px;"</rt></ruby>, but the ruby should have 'line-height: normal'.</p>";
+document.body.appendChild(div);
+
+shouldBeEqualToString("getLineHeight('p')", "48px");
+shouldBeEqualToString("getLineHeight('r')", "normal");
+shouldBeEqualToString("getLineHeight('t')", "normal");
+
+var successfullyParsed = true;
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fed205d..10a14de 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-02 Roland Steiner <rolandsteiner at chromium.org>
+
+ Reviewed by Adele Peterson.
+
+ Bug 34198 - Ruby text should not inherit line-height
+ (https://bugs.webkit.org/show_bug.cgi?id=34198)
+
+ Resetting line-height to 'normal' in the default UA style sheet.
+ Adding layout-test to check for this.
+
+ Test: fast/ruby/ruby-line-height.html
+
+ * css/html.css:
+
2010-02-02 James Robinson <jamesr at chromium.org>
Reviewed by Dmitry Titov.
diff --git a/WebCore/css/html.css b/WebCore/css/html.css
index 913dbe5..9d9225c 100644
--- a/WebCore/css/html.css
+++ b/WebCore/css/html.css
@@ -621,7 +621,8 @@ a:-webkit-any-link:active {
/* HTML5 ruby elements */
ruby, rt {
- text-indent: 0; /* blocks used for ruby rendering should not trigger this */
+ text-indent: 0; /* blocks used for ruby rendering should not trigger this */
+ line-height: normal;
}
ruby > rt {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list