Changeset 91481 in webkit

Timestamp:

Jul 21, 2011, 11:45:44 AM (14 years ago)

Author:

enrica@apple.com

Message:

Cannot click to position the caret to the right of an image with display:block style.
​https://bugs.webkit.org/show_bug.cgi?id=64962
<rdar://problem/9446343>

Reviewed by David Hyatt.

Source/WebCore:

Test: editing/selection/click-on-block-image.html

The current implementation of positionForPoint always returns the visible
position to the left of the image, if the image has a block style.
This patch changes the behavior for block styled images to match the behavior
for inline images.

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::positionForPoint): Modified to avoid relying entirely
on InlineBox to calculate the position.

LayoutTests:

• editing/selection/click-on-block-image-expected.txt: Added.
• editing/selection/click-on-block-image.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/selection/click-on-block-image-expected.txt (added)
• LayoutTests/editing/selection/click-on-block-image.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderReplaced.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-21  Enrica Casucci  <enrica@apple.com>
+
+        Cannot click to position the caret to the right of an image with display:block style.
+        https://bugs.webkit.org/show_bug.cgi?id=64962
+        <rdar://problem/9446343>
+
+        Reviewed by David Hyatt.
+
+        * editing/selection/click-on-block-image-expected.txt: Added.
+        * editing/selection/click-on-block-image.html: Added.
+
 2011-07-21  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-21  Enrica Casucci  <enrica@apple.com>
+
+        Cannot click to position the caret to the right of an image with display:block style.
+        https://bugs.webkit.org/show_bug.cgi?id=64962
+        <rdar://problem/9446343>
+
+        Reviewed by David Hyatt.
+
+        Test: editing/selection/click-on-block-image.html
+
+        The current implementation of positionForPoint always returns the visible
+        position to the left of the image, if the image has a block style.
+        This patch changes the behavior for block styled images to match the behavior
+        for inline images.
+
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::positionForPoint): Modified to avoid relying entirely
+        on InlineBox to calculate the position.
+
 2011-07-21  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -417 +417 @@
 VisiblePosition RenderReplaced::positionForPoint(const LayoutPoint& point)
 {
+    // FIXME: This code is buggy if the replaced element is relative positioned.
     InlineBox* box = inlineBoxWrapper();
-    if (!box)
-        return createVisiblePosition(0, DOWNSTREAM);
-
-    // FIXME: This code is buggy if the replaced element is relative positioned.
-
-    RootInlineBox* root = box->root();
-
-    LayoutUnit top = root->selectionTop();
-    LayoutUnit bottom = root->selectionBottom();
-
-    LayoutUnit blockDirectionPosition = box->isHorizontal() ? point.y() + y() : point.x() + x();
-    LayoutUnit lineDirectionPosition = box->isHorizontal() ? point.x() + x() : point.y() + y();
-
+    RootInlineBox* rootBox = box ? box->root() : 0;
+    
+    LayoutUnit top = rootBox ? rootBox->selectionTop() : logicalTop();
+    LayoutUnit bottom = rootBox ? rootBox->selectionBottom() : logicalBottom();
+    
+    LayoutUnit blockDirectionPosition = isHorizontalWritingMode() ? point.y() + y() : point.x() + x();
+    LayoutUnit lineDirectionPosition = isHorizontalWritingMode() ? point.x() + x() : point.y() + y();
+    
     if (blockDirectionPosition < top)
         return createVisiblePosition(caretMinOffset(), DOWNSTREAM); // coordinates are above
@@ -438 +434 @@
     
     if (node()) {
-        if (lineDirectionPosition <= box->logicalLeft() + (box->logicalWidth() / 2))
+        if (lineDirectionPosition <= logicalLeft() + (logicalWidth() / 2))
             return createVisiblePosition(0, DOWNSTREAM);
         return createVisiblePosition(1, DOWNSTREAM);