Changeset 53494 in webkit

Timestamp:

Jan 19, 2010 2:17:32 PM (14 years ago)

Author:

enrica@apple.com

Message:

WebCore: REGRESSION: Infinite recursion in Position::getInlineBoxAndOffset()
​https://bugs.webkit.org/show_bug.cgi?id=33864
<rdar://problem/7552959>

Reviewed by Simon Fraser.

Regression has been introduced by changeset 53085.
The original fix had to be limited to editable content.

Test: editing/selection/selection-applet.html

• dom/Position.cpp:

(WebCore::Position::getInlineBoxAndOffset):

LayoutTests: REGRESSION: Infinite recursion in Position::getInlineBoxAndOffset()
​https://bugs.webkit.org/show_bug.cgi?id=33864
<rdar://problem/7552959>

Reviewed by Simon Fraser.

• editing/selection/selection-applet-expected.txt: Added.
• editing/selection/selection-applet.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/selection-applet-expected.txt (added)
• LayoutTests/editing/selection/selection-applet.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Position.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-19  Enrica Casucci  <enrica@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        REGRESSION: Infinite recursion in Position::getInlineBoxAndOffset()
+        https://bugs.webkit.org/show_bug.cgi?id=33864
+        <rdar://problem/7552959>
+
+        * editing/selection/selection-applet-expected.txt: Added.
+        * editing/selection/selection-applet.html: Added.
+
 2010-01-15  Ojan Vafai  <ojan@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-19  Enrica Casucci  <enrica@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        REGRESSION: Infinite recursion in Position::getInlineBoxAndOffset()
+        https://bugs.webkit.org/show_bug.cgi?id=33864
+        <rdar://problem/7552959>
+        
+        Regression has been introduced by changeset 53085.
+        The original fix had to be limited to editable content.
+
+        Test: editing/selection/selection-applet.html
+
+        * dom/Position.cpp:
+        (WebCore::Position::getInlineBoxAndOffset):
+
 2010-01-19  Kristian Amlie <kristian.amlie@nokia.com>
 

trunk/WebCore/dom/Position.cpp

@@ -1014 +1014 @@
             }
         }
+        inlineBox = 0;
         if (renderer->isBox()) {
             inlineBox = toRenderBox(renderer)->inlineBoxWrapper();
             if (!inlineBox || (caretOffset > inlineBox->caretMinOffset() && caretOffset < inlineBox->caretMaxOffset()))
                 return;
-        } else {
+        } else if (node()->isContentEditable()) {
             Position pos = positionInParentBeforeNode(node()).upstream();
             pos.getInlineBoxAndOffset(DOWNSTREAM, primaryDirection, inlineBox, caretOffset);