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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 00bf4ea4dd3e57c94a6d6e215e5a90696f658ef5
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 20 00:20:28 2010 +0000

    2010-10-19  Jia Pu  <jpu at apple.com>
    
            Reviewed by James Robinson.
    
            Moving cursor back to autocorrected word in the same line shouldn't remove the underline
            https://bugs.webkit.org/show_bug.cgi?id=47629
            <rdar://problem/8546758>
    
            Patch <http://trac.webkit.org/changeset/70071> breaks some Chromium Mac hehavior. This patch
            fixes that.
    
            * editing/Editor.cpp:
            (WebCore::Editor::respondToChangedSelection): Add "!PLATFORM(MAC)" to make sure nothing changes
              on non-Mac platforms.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70113 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3b66f83..19c338f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-19  Jia Pu  <jpu at apple.com>
+
+        Reviewed by James Robinson.
+
+        Moving cursor back to autocorrected word in the same line shouldn't remove the underline
+        https://bugs.webkit.org/show_bug.cgi?id=47629
+        <rdar://problem/8546758>
+        
+        Patch <http://trac.webkit.org/changeset/70071> breaks some Chromium Mac hehavior. This patch
+        fixes that.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::respondToChangedSelection): Add "!PLATFORM(MAC)" to make sure nothing changes
+          on non-Mac platforms.
+
 2010-10-19  Alexey Proskuryakov  <ap at apple.com>
 
         Build fix (EFL, maybe more).
diff --git a/WebCore/editing/Editor.cpp b/WebCore/editing/Editor.cpp
index 640e739..7b3d055 100644
--- a/WebCore/editing/Editor.cpp
+++ b/WebCore/editing/Editor.cpp
@@ -3609,7 +3609,7 @@ void Editor::respondToChangedSelection(const VisibleSelection& oldSelection, boo
             }
         }
 
-#if PLATFORM(MAC) && (defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD))
+#if !PLATFORM(MAC) || (PLATFORM(MAC) && (defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)))
         // This only erases markers that are in the first unit (word or sentence) of the selection.
         // Perhaps peculiar, but it matches AppKit on these Mac OSX versions.
         if (RefPtr<Range> wordRange = newAdjacentWords.toNormalizedRange())

-- 
WebKit Debian packaging