Changeset 54117 in webkit

Timestamp:

Jan 31, 2010 4:54:49 PM (14 years ago)

Author:

ojan@chromium.org

Message:

2010-01-28 Ojan Vafai <​ojan@chromium.org>

Reviewed by Darin Adler.

Implement CSSOM Range.getClientRects for collapsed selections
​https://bugs.webkit.org/show_bug.cgi?id=34239

Adds two cases to getClientRects test.

• fast/dom/Range/getClientRects-expected.txt:
• fast/dom/Range/getClientRects.html:

2010-01-28 Ojan Vafai <​ojan@chromium.org>

Reviewed by Darin Adler.

Implement CSSOM Range.getClientRects for collapsed selections
​https://bugs.webkit.org/show_bug.cgi?id=34239

When getting the quads for a range on a text node, allow returning
zero width quads. This leaves the case of collapsed selections inside
elements still not fixed, but no worse.

• rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::selectionRect):
• rendering/RenderText.cpp: (WebCore::RenderText::absoluteQuadsForRange):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/Range/getClientRects-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/Range/getClientRects.html (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/InlineTextBox.cpp (modified) (1 diff)
• WebCore/rendering/RenderText.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-28  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Implement CSSOM Range.getClientRects for collapsed selections
+        https://bugs.webkit.org/show_bug.cgi?id=34239
+
+        Adds two cases to getClientRects test. 
+
+        * fast/dom/Range/getClientRects-expected.txt:
+        * fast/dom/Range/getClientRects.html:
+
 2010-01-31  Oliver Hunt  <oliver@apple.com>
 

trunk/LayoutTests/fast/dom/Range/getClientRects-expected.txt

@@ -187 +187 @@
 PASS rects[3].width is 212
 PASS rects[3].height is 247
+Test 9
+FAIL rects.length should be 1. Was 0.
+FAIL rects[0].left should be 8. Threw exception TypeError: Result of expression 'rects[0]' [undefined] is not an object.
+FAIL rects[0].top should be 1903. Threw exception TypeError: Result of expression 'rects[0]' [undefined] is not an object.
+FAIL rects[0].width should be 0. Threw exception TypeError: Result of expression 'rects[0]' [undefined] is not an object.
+FAIL rects[0].height should be 18. Threw exception TypeError: Result of expression 'rects[0]' [undefined] is not an object.
+Test 9b
+PASS rects.length is 1
+PASS rects[0].left is 8
+PASS rects[0].top is 1903
+PASS rects[0].width is 0
+PASS rects[0].height is 18
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/dom/Range/getClientRects.html

@@ -69 +69 @@
 
 <div class="box" id="test8">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div>
+
+<br><br>
+
+<div class="box" id="test9">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</div>
 
 </div>
@@ -340 +344 @@
     shouldBe("rects[3].height", "247");
 
+    debug("Test 9");
+    var range9 = document.createRange();
+    // This case should match test 9b's results. Currently though getClientRects returns an empty list.
+    range9.setStart(document.getElementById('test9'), 0);
+    show(range9);
+    rects = range9.getClientRects();
+    shouldBe("rects.length", "1");
+    shouldBe("rects[0].left", "8");
+    shouldBe("rects[0].top", "1903");
+    shouldBe("rects[0].width", "0");
+    shouldBe("rects[0].height", "18");
+
+    debug("Test 9b");
+    var range9 = document.createRange();
+    range9.setStart(document.getElementById('test9').firstChild, 0);
+    show(range9);
+    rects = range9.getClientRects();
+    shouldBe("rects.length", "1");
+    shouldBe("rects[0].left", "8");
+    shouldBe("rects[0].top", "1903");
+    shouldBe("rects[0].width", "0");
+    shouldBe("rects[0].height", "18");
+
     if (window.layoutTestController) {
         var area = document.getElementById('testArea');

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-28  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Implement CSSOM Range.getClientRects for collapsed selections
+        https://bugs.webkit.org/show_bug.cgi?id=34239
+
+        When getting the quads for a range on a text node, allow returning
+        zero width quads. This leaves the case of collapsed selections inside
+        elements still not fixed, but no worse.
+
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::selectionRect):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::absoluteQuadsForRange):
+
 2010-01-31  Oliver Hunt  <oliver@apple.com>
 

trunk/WebCore/rendering/InlineTextBox.cpp

@@ -109 +109 @@
     int ePos = min(endPos - m_start, (int)m_len);
     
-    if (sPos >= ePos)
+    if (sPos > ePos)
         return IntRect();
 

trunk/WebCore/rendering/RenderText.cpp

@@ -289 +289 @@
             unsigned realEnd = min(box->end() + 1, end);
             IntRect r = box->selectionRect(0, 0, start, realEnd);
-            if (!r.isEmpty()) {
+            if (r.height()) {
                 if (!useSelectionHeight) {
                     // change the height and y position because selectionRect uses selection-specific values