Changeset 97597 in webkit

Timestamp:

Oct 17, 2011 2:18:35 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

when CSS pseudo selectors are applied (:before and :after) the *-of-line keyboard navigation does not work
​https://bugs.webkit.org/show_bug.cgi?id=10123

Patch by Rosen Dash <​rosen.dash@motorola.com> on 2011-10-17
Reviewed by Ryosuke Niwa.

Source/WebCore:

This patch addresses folllowing two issues:

1. When CSS pseudo elements are before or after is used with content attribute containing single character at the start/end of text and we try to move cursor by right navigation key, the page freezes falling into an infinite loop.
2. When these elements try to insert some text between a text line, navigation by right/left arrow key is prohibited.

Tests: editing/selection/css-pseudo-element-hang.html

editing/selection/css-pseudo-element.html

• editing/VisiblePosition.cpp:

(WebCore::VisiblePosition::leftVisuallyDistinctCandidate):
(WebCore::VisiblePosition::rightVisuallyDistinctCandidate):

LayoutTests:

• editing/selection/css-pseudo-element-expected.txt: Added.
• editing/selection/css-pseudo-element-hang-expected.txt: Added.
• editing/selection/css-pseudo-element-hang.html: Added.
• editing/selection/css-pseudo-element.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/css-pseudo-element-expected.txt (added)
• LayoutTests/editing/selection/css-pseudo-element-hang-expected.txt (added)
• LayoutTests/editing/selection/css-pseudo-element-hang.html (added)
• LayoutTests/editing/selection/css-pseudo-element.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/VisiblePosition.cpp (modified) (8 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-10-17  Rosen Dash  <rosen.dash@motorola.com>
+
+        when CSS pseudo selectors are applied (:before and :after) the *-of-line keyboard navigation does not work
+        https://bugs.webkit.org/show_bug.cgi?id=10123
+
+        Reviewed by Ryosuke Niwa.
+
+        * editing/selection/css-pseudo-element-expected.txt: Added.
+        * editing/selection/css-pseudo-element-hang-expected.txt: Added.
+        * editing/selection/css-pseudo-element-hang.html: Added.
+        * editing/selection/css-pseudo-element.html: Added.
+
 2011-10-15  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-17  Rosen Dash  <rosen.dash@motorola.com>
+
+        when CSS pseudo selectors are applied (:before and :after) the *-of-line keyboard navigation does not work
+        https://bugs.webkit.org/show_bug.cgi?id=10123
+
+        Reviewed by Ryosuke Niwa.
+
+        This patch addresses folllowing two issues:
+        1. When CSS pseudo elements are before or after is used with content attribute containing single character
+           at the start/end of text and we try to move cursor by right navigation key, the page freezes falling
+           into an infinite loop.
+        2. When these elements try to insert some text between a text line, navigation by right/left arrow key is prohibited.
+
+        Tests: editing/selection/css-pseudo-element-hang.html
+               editing/selection/css-pseudo-element.html
+
+        * editing/VisiblePosition.cpp:
+        (WebCore::VisiblePosition::leftVisuallyDistinctCandidate):
+        (WebCore::VisiblePosition::rightVisuallyDistinctCandidate):
+
 2011-10-15  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/editing/VisiblePosition.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Portions Copyright (c) 2011 Motorola Mobility, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -126 +127 @@
                 return box->isLeftToRightDirection() ? previousVisuallyDistinctCandidate(m_deepPosition) : nextVisuallyDistinctCandidate(m_deepPosition);
 
+            if (!renderer->node()) {
+                box = box->prevLeafChild();
+                if (!box)
+                    return primaryDirection == LTR ? previousVisuallyDistinctCandidate(m_deepPosition) : nextVisuallyDistinctCandidate(m_deepPosition);
+                renderer = box->renderer();
+                offset = box->caretRightmostOffset();
+                continue;
+            }
+
             offset = box->isLeftToRightDirection() ? renderer->previousOffset(offset) : renderer->nextOffset(offset);
 
@@ -192 +202 @@
                 continue;
             }
+
+            while (prevBox && !prevBox->renderer()->node())
+                prevBox = prevBox->prevLeafChild();
 
             if (prevBox) {
@@ -235 +248 @@
         if ((p.isCandidate() && p.downstream() != downstreamStart) || p.atStartOfTree() || p.atEndOfTree())
             return p;
+
+        ASSERT(p != m_deepPosition);
     }
 }
@@ -276 +291 @@
             if ((renderer->isReplaced() || renderer->isBR()) && offset == box->caretLeftmostOffset())
                 return box->isLeftToRightDirection() ? nextVisuallyDistinctCandidate(m_deepPosition) : previousVisuallyDistinctCandidate(m_deepPosition);
+
+            if (!renderer->node()) {
+                box = box->nextLeafChild();
+                if (!box)
+                    return primaryDirection == LTR ? nextVisuallyDistinctCandidate(m_deepPosition) : previousVisuallyDistinctCandidate(m_deepPosition);
+                renderer = box->renderer();
+                offset = box->caretLeftmostOffset();
+                continue;
+            }
 
             offset = box->isLeftToRightDirection() ? renderer->nextOffset(offset) : renderer->previousOffset(offset);
@@ -323 +347 @@
                     break;
                 }
+
                 if (nextBox->bidiLevel() >= level)
                     break;
@@ -345 +370 @@
             }
 
+            while (nextBox && !nextBox->renderer()->node())
+                nextBox = nextBox->nextLeafChild();
+
             if (nextBox) {
                 box = nextBox;
                 renderer = box->renderer();
                 offset = box->caretLeftmostOffset();
+
                 if (box->bidiLevel() > level) {
                     do {
@@ -387 +416 @@
         if ((p.isCandidate() && p.downstream() != downstreamStart) || p.atStartOfTree() || p.atEndOfTree())
             return p;
+
+        ASSERT(p != m_deepPosition);
     }
 }