[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[mitz at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit e15908bc43639b18c5efc1103cc56bc5e2870333
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 09:50:33 2011 +0000

    <rdar://problem/8858548> Disable inheritance of text emphasis marks to ruby text
    https://bugs.webkit.org/show_bug.cgi?id=52359
    
    Reviewed by Dave Hyatt.
    
    Source/WebCore:
    
    Test: fast/ruby/text-emphasis.html
    
    * css/html.css:
    (rt):
    
    LayoutTests:
    
    * fast/ruby/text-emphasis-expected.txt: Added.
    * fast/ruby/text-emphasis.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75707 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index aff6894..7a6eecb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-13  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        <rdar://problem/8858548> Disable inheritance of text emphasis marks to ruby text
+        https://bugs.webkit.org/show_bug.cgi?id=52359
+
+        * fast/ruby/text-emphasis-expected.txt: Added.
+        * fast/ruby/text-emphasis.html: Added.
+
 2011-01-13  Hayato Ito  <hayato at chromium.org>
 
         Unreviewed, chromium test expectations.
diff --git a/LayoutTests/fast/ruby/text-emphasis-expected.txt b/LayoutTests/fast/ruby/text-emphasis-expected.txt
new file mode 100644
index 0000000..076eada
--- /dev/null
+++ b/LayoutTests/fast/ruby/text-emphasis-expected.txt
@@ -0,0 +1,8 @@
+Test the user agent style sheet rule that disables inheritance of text-emphasis to ruby text.
+
+攻殻 機動隊 攻殻
+こうかく
+機動隊
+きどうたい
+
+PASS
diff --git a/LayoutTests/fast/ruby/text-emphasis.html b/LayoutTests/fast/ruby/text-emphasis.html
new file mode 100644
index 0000000..4167aa6
Binary files /dev/null and b/LayoutTests/fast/ruby/text-emphasis.html differ
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c9b0536..aa2664e 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-13  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        <rdar://problem/8858548> Disable inheritance of text emphasis marks to ruby text
+        https://bugs.webkit.org/show_bug.cgi?id=52359
+
+        Test: fast/ruby/text-emphasis.html
+
+        * css/html.css:
+        (rt):
+
 2011-01-13  Csaba Osztrogonác  <ossy at webkit.org>
 
         Rubber-stamped by David Levin.
diff --git a/Source/WebCore/css/html.css b/Source/WebCore/css/html.css
index d6fbbdf..fb3a2c8 100644
--- a/Source/WebCore/css/html.css
+++ b/Source/WebCore/css/html.css
@@ -2,7 +2,7 @@
  * The default style sheet used to render HTML.
  *
  * Copyright (C) 2000 Lars Knoll (knoll at kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -739,6 +739,7 @@ ruby, rt {
 
 rt {
     line-height: normal;
+    -webkit-text-emphasis: none;
 }
 
 ruby > rt {

-- 
WebKit Debian packaging