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

mitz at apple.com mitz at apple.com
Wed Dec 22 14:47:54 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 065987aae6435c4b4e34a36099ae09ede849018b
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 20 19:46:21 2010 +0000

    Updated Mac results for fast/text/hyphenate-locale.html
    
    Rubber-stamped by Anders Carlsson.
    
    * platform/mac-snowleopard/fast: Added.
    * platform/mac-snowleopard/fast/text: Added.
    * platform/mac-snowleopard/fast/text/hyphenate-locale-expected.txt: Copied from LayoutTests/platform/mac/fast/text/hyphenate-locale-expected.txt.
    * platform/mac/fast/text/hyphenate-locale-expected.txt: Replaced.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70163 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index edbb28b..241272c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-20  Dan Bernstein  <mitz at apple.com>
+
+        Rubber-stamped by Anders Carlsson.
+
+        Updated Mac results for fast/text/hyphenate-locale.html
+
+        * platform/mac-snowleopard/fast: Added.
+        * platform/mac-snowleopard/fast/text: Added.
+        * platform/mac-snowleopard/fast/text/hyphenate-locale-expected.txt: Copied from LayoutTests/platform/mac/fast/text/hyphenate-locale-expected.txt.
+        * platform/mac/fast/text/hyphenate-locale-expected.txt: Replaced.
+
 2010-10-20  James Robinson  <jamesr at chromium.org>
 
         Follow-up to 70155: rename an expectation to -expected.txt
diff --git a/LayoutTests/platform/mac/fast/text/hyphenate-locale-expected.txt b/LayoutTests/platform/mac-snowleopard/fast/text/hyphenate-locale-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/text/hyphenate-locale-expected.txt
copy to LayoutTests/platform/mac-snowleopard/fast/text/hyphenate-locale-expected.txt
diff --git a/LayoutTests/platform/mac/fast/text/hyphenate-locale-expected.txt b/LayoutTests/platform/mac/fast/text/hyphenate-locale-expected.txt
index 205f305..17b84c3 100644
--- a/LayoutTests/platform/mac/fast/text/hyphenate-locale-expected.txt
+++ b/LayoutTests/platform/mac/fast/text/hyphenate-locale-expected.txt
@@ -37,9 +37,9 @@ layer at (0,0) size 785x754
             text run at (0,0) width 66: "reci"
             text run at (0,41) width 102: "procity"
         RenderBlock {DIV} at (0,246) size 135x82
-          RenderText {#text} at (0,0) size 102x82
-            text run at (0,0) width 66: "reci"
-            text run at (0,41) width 102: "procity"
+          RenderText {#text} at (0,0) size 114x82
+            text run at (0,0) width 114: "recipro"
+            text run at (0,41) width 54: "city"
         RenderBlock {DIV} at (0,328) size 135x41
           RenderText {#text} at (0,0) size 156x41
             text run at (0,0) width 156: "reciprocity"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list