[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[mitz at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit a376163e54b59d1ef67b7dd6703a0ae4bf1adc84
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 30 07:24:09 2009 +0000

    Removed test for an impossible condition (a glyph in a right-to-left run not having
    the RTL flag 0x800)
    
    Reviewed by Adele Peterson.
    
    * platform/graphics/mac/ComplexTextControllerATSUI.cpp:
    (WebCore::ComplexTextController::ComplexTextRun::overrideLayoutOperation):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50321 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b29f885..4159887 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-30  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Adele Peterson.
+
+        Removed test for an impossible condition (a glyph in a right-to-left run not having
+        the RTL flag 0x800)
+
+        * platform/graphics/mac/ComplexTextControllerATSUI.cpp:
+        (WebCore::ComplexTextController::ComplexTextRun::overrideLayoutOperation):
+
 2009-10-29  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp b/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
index 2d060c7..78c588f 100644
--- a/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
+++ b/WebCore/platform/graphics/mac/ComplexTextControllerATSUI.cpp
@@ -73,8 +73,6 @@ OSStatus ComplexTextController::ComplexTextRun::overrideLayoutOperation(ATSULayo
 
     for (ItemCount i = 0; i < count; ++i, ++j) {
         if (layoutRecords[j].glyphID == kATSDeletedGlyphcode) {
-            if (!complexTextRun->m_ltr && !(layoutRecords[j].flags & 0x800))
-                complexTextRun->m_indices[complexTextRun->m_indices.size() - 1] = layoutRecords[j].originalOffset / 2 + indexOffset;
             complexTextRun->m_glyphCount--;
             continue;
         }

-- 
WebKit Debian packaging