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

[agl at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit ca874b984e0a576eaa501c3a6c9268fe6530b7d2
Author: agl at chromium.org <agl at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 7 14:53:31 2010 +0000

    2010-09-07  Adam Langley  <agl at chromium.org>
    
            Reviewed by Tony Chang.
    
            [chromium] Fix complex text word spacing on Linux.
    
            I broke complex text word spacing with r66689. I misnamed a
            variable in the original code |glyphIndex| when it was
            actually indexing code points. That meant that I compared it
            against the wrong limit when working around Harfbuzz issues
            and neatly disabled word spacing.
    
            https://bugs.webkit.org/show_bug.cgi?id=45191
    
            Test: fast/text/atsui-spacing-features.html
    
            * platform/graphics/chromium/FontLinux.cpp:
            (WebCore::TextRunWalker::setGlyphXPositions):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66882 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 50b4148..014d9d1 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3135,9 +3135,6 @@ BUG54333 WIN LINUX : fast/replaced/embed-display-none.html = PASS TIMEOUT
 BUG54334 LINUX : media/video-timeupdate-during-playback.html = PASS TIMEOUT
 BUG54348 LINUX : http/tests/security/xssAuditor/dom-write-innerHTML.html = PASS TEXT
 
-// Regressed in r66689
-BUGTONY LINUX : fast/text/atsui-spacing-features.html = IMAGE+TEXT
-
 // New test in r66740
 BUGWK45193 LINUX : fast/text/decomposed-after-stacked-diacritics.html = TEXT
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 59cf7dc..c38e4cd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-07  Adam Langley  <agl at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] Fix complex text word spacing on Linux.
+
+        I broke complex text word spacing with r66689. I misnamed a
+        variable in the original code |glyphIndex| when it was
+        actually indexing code points. That meant that I compared it
+        against the wrong limit when working around Harfbuzz issues
+        and neatly disabled word spacing.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45191
+
+        Test: fast/text/atsui-spacing-features.html
+
+        * platform/graphics/chromium/FontLinux.cpp:
+        (WebCore::TextRunWalker::setGlyphXPositions):
+
 2010-09-07  Satish Sampath  <satish at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/WebCore/platform/graphics/chromium/FontLinux.cpp b/WebCore/platform/graphics/chromium/FontLinux.cpp
index 2520c30..ab3045e 100644
--- a/WebCore/platform/graphics/chromium/FontLinux.cpp
+++ b/WebCore/platform/graphics/chromium/FontLinux.cpp
@@ -528,12 +528,11 @@ private:
             m_xPositions[i] = m_offsetX + position + offsetX;
 
             double advance = truncateFixedPointToInteger(m_item.advances[i]);
-            unsigned glyphIndex = m_item.item.pos + logClustersIndex;
             // The first half of the conjuction works around the case where
             // output glyphs aren't associated with any codepoints by the
             // clusters log.
-            if (glyphIndex < m_item.num_glyphs
-                && isWordBreak(glyphIndex, isRTL)) {
+            if (logClustersIndex < m_item.item.length
+                && isWordBreak(m_item.item.pos + logClustersIndex, isRTL)) {
                 advance += m_wordSpacingAdjustment;
 
                 if (m_padding > 0) {

-- 
WebKit Debian packaging