Changeset 70786 in webkit

Timestamp:

Oct 28, 2010 10:10:19 AM (13 years ago)

Author:

tony@chromium.org

Message:

2010-10-28 Tony Chang <​tony@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@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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (2 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/chromium/TextInputController.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-28  Tony Chang  <tony@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@apple.com>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -656 +656 @@
 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
@@ -662 +663 @@
 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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-28  Tony Chang  <tony@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@chromium.org>
 

trunk/WebKitTools/DumpRenderTree/chromium/TextInputController.cpp

@@ -44 +44 @@
 
 using namespace WebKit;
-using namespace std;
 
 TestShell* TextInputController::testShell = 0;
@@ -171 +170 @@
 
     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));
 }
 
@@ -185 +185 @@
 
     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));
 }