Changeset 89056 in webkit

Timestamp:

Jun 16, 2011 12:11:32 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-06-16 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

Consider padding and border when looking for the next/previous line position
​https://bugs.webkit.org/show_bug.cgi?id=55481

Added a test to ensure WebKit can allow vertical caret movements even when
inline elements that span multiple lines have paddings, borders, or both.

• editing/selection/move-vertically-with-paddings-borders-expected.txt: Added.
• editing/selection/move-vertically-with-paddings-borders.html: Added.

2011-06-16 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

Consider padding and border when looking for the next/previous line position
​https://bugs.webkit.org/show_bug.cgi?id=55481

The bug was caused by previousLinePosition and nextLinePosition passing y coordinate
above the line in some cases. Fixed the bug by passing the larger of selectionTop and logicalTop.

This patch is based on a patch originally written by Mario Sanchez Prada <​msanchez@igalia.com>.

Test: editing/selection/move-vertically-with-paddings-borders.html

• editing/visible_units.cpp: (WebCore::previousLinePosition): (WebCore::nextLinePosition):
• rendering/RootInlineBox.h: (WebCore::RootInlineBox::blockDirectionPointInLine):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/move-vertically-with-paddings-borders-expected.txt (added)
• LayoutTests/editing/selection/move-vertically-with-paddings-borders.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/visible_units.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RootInlineBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-16  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Consider padding and border when looking for the next/previous line position
+        https://bugs.webkit.org/show_bug.cgi?id=55481
+
+        Added a test to ensure WebKit can allow vertical caret movements even when
+        inline elements that span multiple lines have paddings, borders, or both.
+
+        * editing/selection/move-vertically-with-paddings-borders-expected.txt: Added.
+        * editing/selection/move-vertically-with-paddings-borders.html: Added.
+
 2011-06-16  Keunsoon Lee  <keunsoon.lee@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-16  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Consider padding and border when looking for the next/previous line position
+        https://bugs.webkit.org/show_bug.cgi?id=55481
+
+        The bug was caused by previousLinePosition and nextLinePosition passing y coordinate
+        above the line in some cases. Fixed the bug by passing the larger of selectionTop and logicalTop.
+
+        This patch is based on a patch originally written by Mario Sanchez Prada <msanchez@igalia.com>.
+
+        Test: editing/selection/move-vertically-with-paddings-borders.html
+
+        * editing/visible_units.cpp:
+        (WebCore::previousLinePosition):
+        (WebCore::nextLinePosition):
+        * rendering/RootInlineBox.h:
+        (WebCore::RootInlineBox::blockDirectionPointInLine):
+
 2011-06-16  Keunsoon Lee  <keunsoon.lee@samsung.com>
 

trunk/Source/WebCore/editing/visible_units.cpp

@@ -574 +574 @@
         if (node && editingIgnoresContent(node))
             return positionInParentBeforeNode(node);
-        return renderer->positionForPoint(IntPoint(x - absPos.x(), root->lineTop()));
+        return renderer->positionForPoint(IntPoint(x - absPos.x(), root->blockDirectionPointInLine()));
     }
     
@@ -681 +681 @@
         if (node && editingIgnoresContent(node))
             return positionInParentBeforeNode(node);
-        return renderer->positionForPoint(IntPoint(x - absPos.x(), root->lineTop()));
+        return renderer->positionForPoint(IntPoint(x - absPos.x(), root->blockDirectionPointInLine()));
     }    
 

trunk/Source/WebCore/rendering/RootInlineBox.h

@@ -57 +57 @@
     int selectionBottom() const;
     int selectionHeight() const { return max(0, selectionBottom() - selectionTop()); }
+
+    int blockDirectionPointInLine() const { return max(lineTop(), selectionTop()); }
 
     int alignBoxesInBlockDirection(int heightOfBlock, GlyphOverflowAndFallbackFontsMap&, VerticalPositionCache&);