Fix a typo introduced in r142705.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Feb 2013 05:47:52 +0000 (05:47 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Feb 2013 05:47:52 +0000 (05:47 +0000)
Without this fix, text-input-controller.html can fail when DeleteButtonController is enabled.
e.g. "run-webkit-tests platform/mac/editing/deleting/deletionUI-single-instance.html
    platform/mac/editing/input/text-input-controller.html --child-processes=1"

* editing/Editor.cpp:
(WebCore::Editor::avoidIntersectionWithDeleteButtonController):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142958 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/editing/Editor.cpp

index fb25331775d03583311956422705fdc0889d6dfe..986a3dbe42cad656f8a7171b6e11ba4d81ecc861 100644 (file)
@@ -1,3 +1,14 @@
+2013-02-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Fix a typo introduced in r142705.
+
+        Without this fix, text-input-controller.html can fail when DeleteButtonController is enabled.
+        e.g. "run-webkit-tests platform/mac/editing/deleting/deletionUI-single-instance.html
+            platform/mac/editing/input/text-input-controller.html --child-processes=1"
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::avoidIntersectionWithDeleteButtonController):
+
 2013-02-14  Hayato Ito  <hayato@chromium.org>
 
         Factor Event retargeting code.
index 763de7155994a9b2c60ef270b82adcccbfec587d..7c4627c07bf11d561df74da3d8196293eb57e716 100644 (file)
@@ -154,7 +154,7 @@ VisibleSelection Editor::avoidIntersectionWithDeleteButtonController(const Visib
     if (updatedBase != selection.base())
         updatedSelection.setBase(updatedBase);
 
-    Position updatedExtent = selection.base();
+    Position updatedExtent = selection.extent();
     updatePositionForNodeRemoval(updatedExtent, element);
     if (updatedExtent != selection.extent())
         updatedSelection.setExtent(updatedExtent);