Changeset 99770 in webkit

Timestamp:

Nov 9, 2011, 3:28:12 PM (14 years ago)

Author:

dmazzoni@google.com

Message:

Source/WebKit/chromium: Fix crash by handling case when AccessibilityObject::lineForPosition
returns -1.
​https://bugs.webkit.org/show_bug.cgi?id=71561

Adds layout test: platform/chromium/accessibility/insertion-point-line-number-on-password-crashes.html

Reviewed by Dimitri Glazkov.

• src/WebAccessibilityObject.cpp:

(WebKit::WebAccessibilityObject::lineBreaks):

Tools: [Chromium] Implement AccessibilityUIElement::insertionPointLineNumberGetterCallback
​https://bugs.webkit.org/show_bug.cgi?id=71561

Reviewed by Dimitri Glazkov.

• DumpRenderTree/chromium/AccessibilityUIElement.cpp:

(AccessibilityUIElement::insertionPointLineNumberGetterCallback):

LayoutTests: [Chromium] Add new test for crash in WebAccessibilityObject::lineBreaks
​https://bugs.webkit.org/show_bug.cgi?id=71561

Reviewed by Dimitri Glazkov.

• platform/chromium/accessibility/insertion-point-line-number-on-password-crashes-expected.txt: Added.
• platform/chromium/accessibility/insertion-point-line-number-on-password-crashes.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/accessibility/insertion-point-line-number-on-password-crashes-expected.txt (added)
• LayoutTests/platform/chromium/accessibility/insertion-point-line-number-on-password-crashes.html (added)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/WebAccessibilityObject.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/AccessibilityUIElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-09  Dominic Mazzoni  <dmazzoni@google.com>
+
+        [Chromium] Add new test for crash in WebAccessibilityObject::lineBreaks
+        https://bugs.webkit.org/show_bug.cgi?id=71561
+
+        Reviewed by Dimitri Glazkov.
+
+        * platform/chromium/accessibility/insertion-point-line-number-on-password-crashes-expected.txt: Added.
+        * platform/chromium/accessibility/insertion-point-line-number-on-password-crashes.html: Added.
+
 2011-11-09  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-11-09  Dominic Mazzoni  <dmazzoni@google.com>
+
+        Fix crash by handling case when AccessibilityObject::lineForPosition
+        returns -1.
+        https://bugs.webkit.org/show_bug.cgi?id=71561
+
+        Adds layout test: platform/chromium/accessibility/insertion-point-line-number-on-password-crashes.html
+
+        Reviewed by Dimitri Glazkov.
+
+        * src/WebAccessibilityObject.cpp:
+        (WebKit::WebAccessibilityObject::lineBreaks):
+
 2011-11-09  Jay Civelli  <jcivelli@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp

@@ -772 +772 @@
     VisiblePosition pos = m_private->visiblePositionForIndex(textLength);
     int lineBreakCount = m_private->lineForPosition(pos);
-    if (!lineBreakCount)
+    if (lineBreakCount <= 0)
         return false;
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-09  Dominic Mazzoni  <dmazzoni@google.com>
+
+        [Chromium] Implement AccessibilityUIElement::insertionPointLineNumberGetterCallback
+        https://bugs.webkit.org/show_bug.cgi?id=71561
+
+        Reviewed by Dimitri Glazkov.
+
+        * DumpRenderTree/chromium/AccessibilityUIElement.cpp:
+        (AccessibilityUIElement::insertionPointLineNumberGetterCallback):
+
 2011-11-09  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Tools/DumpRenderTree/chromium/AccessibilityUIElement.cpp

@@ -454 +454 @@
 void AccessibilityUIElement::insertionPointLineNumberGetterCallback(CppVariant* result)
 {
-    // FIXME: Implement this.
-    result->set(0);
+    WebVector<int> lineBreaks;
+    accessibilityObject().lineBreaks(lineBreaks);
+    int cursor = accessibilityObject().selectionEnd();
+    int line = 0;
+    while (line < static_cast<int>(lineBreaks.size()) && lineBreaks[line] <= cursor)
+        line++;
+    result->set(line);
 }