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

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 434fd789f802fec0467b78227971ed1380806a0c
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 17:10:19 2010 +0000

    2010-10-28  Tony Chang  <tony at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [chromium] fix textInputController.{selectedRange,markedRange}
            https://bugs.webkit.org/show_bug.cgi?id=48487
    
            * platform/chromium/test_expectations.txt: correct some comments about
                firstRectForCharacterRange.
    2010-10-28  Tony Chang  <tony at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [chromium] fix textInputController.{selectedRange,markedRange}
            https://bugs.webkit.org/show_bug.cgi?id=48487
    
            * DumpRenderTree/chromium/TextInputController.cpp:
            (TextInputController::markedRange): Return arrays of ints, rather than a string
            (TextInputController::selectedRange): Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70786 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 71992ea..2bb7341 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-28  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] fix textInputController.{selectedRange,markedRange}
+        https://bugs.webkit.org/show_bug.cgi?id=48487
+
+        * platform/chromium/test_expectations.txt: correct some comments about
+            firstRectForCharacterRange.
+
 2010-10-28  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index d0d2c6d..8a3e6ac 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -655,19 +655,21 @@ BUG20844 LINUX WIN DEBUG : editing/selection/designmode-no-caret.html = FAIL
 // Regression from merge 41268:41286
 BUG10435 MAC : editing/selection/designmode-no-caret.html = FAIL
 
-// Issue 3273: TextInputController::firstRectForCharacterRange not implemented.
+// Issue 3273: TextInputController::firstRectForCharacterRange not returning
+// the correct values for bidi/rtl text.
 BUG3273 : editing/selection/move-left-right.html = FAIL
 BUG3273 MAC : platform/mac/editing/input/caret-primary-bidi.html = FAIL PASS
 BUG3273 MAC : platform/mac/editing/input/firstrectforcharacterrange-plain.html = FAIL PASS
 BUG3273 MAC : platform/mac/editing/input/range-for-empty-document.html = FAIL PASS
 BUGWK38100 : editing/inserting/caret-position.html = TEXT PASS
+// These tests also use firstRectForCharacterRange, but they generate slightly
+// different values.
+BUG3273 : editing/selection/5825350-1.html = TEXT
+BUG3273 : editing/selection/5825350-2.html = TEXT
+BUG3273 : editing/selection/mixed-editability-10.html = TEXT
 
 // WebKit 50358:50395
 BUG3273 WIN LINUX : fast/text/international/thai-cursor-position.html = TEXT
-// WebKit roll 51512:51524
-BUG3273 : editing/selection/5825350-1.html = FAIL
-BUG3273 : editing/selection/5825350-2.html = FAIL
-BUG3273 : editing/selection/mixed-editability-10.html = FAIL
 
 // Linux pixeltest failure: caret is in the wrong place
 // Upstream WebKit also skips this test and Safari with latest WebKit shows
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1a33b99..428e541 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-28  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] fix textInputController.{selectedRange,markedRange}
+        https://bugs.webkit.org/show_bug.cgi?id=48487
+
+        * DumpRenderTree/chromium/TextInputController.cpp:
+        (TextInputController::markedRange): Return arrays of ints, rather than a string
+        (TextInputController::selectedRange): Ditto.
+
 2010-10-27  Ojan Vafai  <ojan at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKitTools/DumpRenderTree/chromium/TextInputController.cpp b/WebKitTools/DumpRenderTree/chromium/TextInputController.cpp
index d9c794c..3603840 100644
--- a/WebKitTools/DumpRenderTree/chromium/TextInputController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TextInputController.cpp
@@ -43,7 +43,6 @@
 #include <string>
 
 using namespace WebKit;
-using namespace std;
 
 TestShell* TextInputController::testShell = 0;
 
@@ -170,9 +169,10 @@ void TextInputController::markedRange(const CppArgumentList&, CppVariant* result
         return;
 
     WebRange range = mainFrame->markedRange();
-    char buffer[30];
-    snprintf(buffer, 30, "%d,%d", range.startOffset(), range.endOffset());
-    result->set(string(buffer));
+    Vector<int> intArray(2);
+    intArray[0] = range.startOffset();
+    intArray[1] = range.endOffset();
+    result->set(WebBindings::makeIntArray(intArray));
 }
 
 void TextInputController::selectedRange(const CppArgumentList&, CppVariant* result)
@@ -184,9 +184,10 @@ void TextInputController::selectedRange(const CppArgumentList&, CppVariant* resu
         return;
 
     WebRange range = mainFrame->selectionRange();
-    char buffer[30];
-    snprintf(buffer, 30, "%d,%d", range.startOffset(), range.endOffset());
-    result->set(string(buffer));
+    Vector<int> intArray(2);
+    intArray[0] = range.startOffset();
+    intArray[1] = range.endOffset();
+    result->set(WebBindings::makeIntArray(intArray));
 }
 
 void TextInputController::firstRectForCharacterRange(const CppArgumentList& arguments, CppVariant* result)

-- 
WebKit Debian packaging