[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 13:58:03 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 6cb4ef1a93af85f260bfbfda6ecb7262e82d6810
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 17:23:33 2010 +0000

    Make Windows match the Mac fallback font for the hyphen character in two tests
    
    Fixes <http://webkit.org/b/46909> <rdar://problem/8497214> REGRESSION
    (r68551): fast/text/midword-break-after-breakable-char.html and
    fast/text/basic/014.html are failing on Windows
    
    Rubber-stamped by Dan Bernstein.
    
    * fast/text/basic/014.html:
    * fast/text/midword-break-after-breakable-char.html:
    Added a little @font-face magic to force the font for the hyphen
    character.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68798 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index aa36098..1bf7900 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-30  Adam Roben  <aroben at apple.com>
+
+        Make Windows match the Mac fallback font for the hyphen character in
+        two tests
+
+        Fixes <http://webkit.org/b/46909> <rdar://problem/8497214> REGRESSION
+        (r68551): fast/text/midword-break-after-breakable-char.html and
+        fast/text/basic/014.html are failing on Windows
+
+        Rubber-stamped by Dan Bernstein.
+
+        * fast/text/basic/014.html:
+        * fast/text/midword-break-after-breakable-char.html:
+        Added a little @font-face magic to force the font for the hyphen
+        character.
+
 2010-09-30  Renata Hodovan  <reni at inf.u-szeged.hu>
 
         Reviewed by Dirk Schulze.
diff --git a/LayoutTests/fast/text/basic/014.html b/LayoutTests/fast/text/basic/014.html
index e564b3b..4aa30e0 100644
--- a/LayoutTests/fast/text/basic/014.html
+++ b/LayoutTests/fast/text/basic/014.html
@@ -1,3 +1,11 @@
+<style>
+    /* Match the Mac fallback font for the hyphen character. */
+    @font-face {
+        font-family: 'times';
+        src: local('Lucida Grande');
+        unicode-range: U+2010;
+    }
+</style>
 <div style="width:50%; border:2px solid red">
 <p>I&#8217;m told this is the longest word in the English language: anti&shy;dis&shy;est&shy;ab&shy;lish&shy;ment&shy;arian&shy;ism.</p>
 <p>I&#8217;m told this is the longest word in the English language: anti&#173;dis&#173;est&#173;ab&#173;lish&#173;ment&#173;arian&#173;ism.</p>
diff --git a/LayoutTests/fast/text/midword-break-after-breakable-char.html b/LayoutTests/fast/text/midword-break-after-breakable-char.html
index 58a39f3..fb4b9d3 100644
--- a/LayoutTests/fast/text/midword-break-after-breakable-char.html
+++ b/LayoutTests/fast/text/midword-break-after-breakable-char.html
@@ -1,6 +1,12 @@
 <head>
     <style>
         div { margin: 4px; width: 300px; background: lightyellow; word-wrap: break-word; float: left; }
+        /* Match the Mac fallback font for the hyphen character. */
+        @font-face {
+            font-family: 'times';
+            src: local('Lucida Grande');
+            unicode-range: U+2010;
+        }
     </style>
 </head>
 <body>

-- 
WebKit Debian packaging

