Changeset 142335 in webkit

Timestamp:

Feb 8, 2013 5:48:09 PM (11 years ago)

Author:

aestes@apple.com

Message:

Restore pre-r118852 behavior for EllipsisBox::nodeAtPoint()
​https://bugs.webkit.org/show_bug.cgi?id=109277

Reviewed by Simon Fraser.

Source/WebCore:

Test: fast/flexbox/line-clamp-link-after-ellipsis.html

Roll out r118852. Enough time has passed that this can't be done
mechanically, so transcribe the old method definition to current
WebCore interfaces.

• rendering/EllipsisBox.cpp:

(WebCore::EllipsisBox::markupBox): EllipsisBox no longer has
m_markupBox, so break the logic for finding the markup box from
paintMarkupBox() into its own function.
(WebCore::EllipsisBox::paintMarkupBox): Call markupBox().
(WebCore::EllipsisBox::nodeAtPoint): Transcribe the pre-r118852 implementation.

• rendering/EllipsisBox.h:

(EllipsisBox): Declare markupBox().

LayoutTests:

Remove test added by r118852 and add a test that verifies the original
expected behavior.

• fast/css/text-overflow-ellipsis-hit-test-expected.txt: Removed.
• fast/css/text-overflow-ellipsis-hit-test.html: Removed.
• fast/flexbox/line-clamp-link-after-ellipsis-expected.txt: Added.
• fast/flexbox/line-clamp-link-after-ellipsis.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/text-overflow-ellipsis-hit-test-expected.txt (deleted)
• LayoutTests/fast/css/text-overflow-ellipsis-hit-test.html (deleted)
• LayoutTests/fast/flexbox/line-clamp-link-after-ellipsis-expected.txt (added)
• LayoutTests/fast/flexbox/line-clamp-link-after-ellipsis.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/EllipsisBox.cpp (modified) (3 diffs)
• Source/WebCore/rendering/EllipsisBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-08  Andy Estes  <aestes@apple.com>
+
+        Restore pre-r118852 behavior for EllipsisBox::nodeAtPoint()
+        https://bugs.webkit.org/show_bug.cgi?id=109277
+
+        Reviewed by Simon Fraser.
+
+        Remove test added by r118852 and add a test that verifies the original
+        expected behavior.
+
+        * fast/css/text-overflow-ellipsis-hit-test-expected.txt: Removed.
+        * fast/css/text-overflow-ellipsis-hit-test.html: Removed.
+        * fast/flexbox/line-clamp-link-after-ellipsis-expected.txt: Added.
+        * fast/flexbox/line-clamp-link-after-ellipsis.html: Added.
+
 2013-02-08  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-08  Andy Estes  <aestes@apple.com>
+
+        Restore pre-r118852 behavior for EllipsisBox::nodeAtPoint()
+        https://bugs.webkit.org/show_bug.cgi?id=109277
+
+        Reviewed by Simon Fraser.
+
+        Test: fast/flexbox/line-clamp-link-after-ellipsis.html
+
+        Roll out r118852. Enough time has passed that this can't be done
+        mechanically, so transcribe the old method definition to current
+        WebCore interfaces.
+
+        * rendering/EllipsisBox.cpp:
+        (WebCore::EllipsisBox::markupBox): EllipsisBox no longer has
+        m_markupBox, so break the logic for finding the markup box from
+        paintMarkupBox() into its own function.
+        (WebCore::EllipsisBox::paintMarkupBox): Call markupBox().
+        (WebCore::EllipsisBox::nodeAtPoint): Transcribe the pre-r118852 implementation.
+        * rendering/EllipsisBox.h:
+        (EllipsisBox): Declare markupBox().
+
 2013-02-08  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/rendering/EllipsisBox.cpp

@@ -70 +70 @@
 }
 
-void EllipsisBox::paintMarkupBox(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, RenderStyle* style)
+InlineBox* EllipsisBox::markupBox() const
 {
     if (!m_shouldPaintMarkupBox || !m_renderer->isRenderBlock())
-        return;
+        return 0;
 
     RenderBlock* block = toRenderBlock(m_renderer);
     RootInlineBox* lastLine = block->lineAtIndex(block->lineCount() - 1);
     if (!lastLine)
-        return;
+        return 0;
 
     // If the last line-box on the last line of a block is a link, -webkit-line-clamp paints that box after the ellipsis.
@@ -84 +84 @@
     InlineBox* anchorBox = lastLine->lastChild();
     if (!anchorBox || !anchorBox->renderer()->style()->isLink())
+        return 0;
+
+    return anchorBox;
+}
+
+void EllipsisBox::paintMarkupBox(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, RenderStyle* style)
+{
+    InlineBox* markupBox = this->markupBox();
+    if (!markupBox)
         return;
 
     LayoutPoint adjustedPaintOffset = paintOffset;
-    adjustedPaintOffset.move(x() + m_logicalWidth - anchorBox->x(),
-        y() + style->fontMetrics().ascent() - (anchorBox->y() + anchorBox->renderer()->style(isFirstLineStyle())->fontMetrics().ascent()));
-    anchorBox->paint(paintInfo, adjustedPaintOffset, lineTop, lineBottom);
+    adjustedPaintOffset.move(x() + m_logicalWidth - markupBox->x(),
+        y() + style->fontMetrics().ascent() - (markupBox->y() + markupBox->renderer()->style(isFirstLineStyle())->fontMetrics().ascent()));
+    markupBox->paint(paintInfo, adjustedPaintOffset, lineTop, lineBottom);
 }
 
@@ -122 +131 @@
 }
 
-bool EllipsisBox::nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&, LayoutUnit, LayoutUnit)
+bool EllipsisBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
 {
+    LayoutPoint adjustedLocation = accumulatedOffset + roundedLayoutPoint(topLeft());
+
+    // Hit test the markup box.
+    if (InlineBox* markupBox = this->markupBox()) {
+        RenderStyle* style = m_renderer->style(isFirstLineStyle());
+        LayoutUnit mtx = adjustedLocation.x() + m_logicalWidth - markupBox->x();
+        LayoutUnit mty = adjustedLocation.y() + style->fontMetrics().ascent() - (markupBox->y() + markupBox->renderer()->style(isFirstLineStyle())->fontMetrics().ascent());
+        if (markupBox->nodeAtPoint(request, result, locationInContainer, LayoutPoint(mtx, mty), lineTop, lineBottom)) {
+            renderer()->updateHitTestResult(result, locationInContainer.point() - LayoutSize(mtx, mty));
+            return true;
+        }
+    }
+
+    LayoutRect boundsRect(adjustedLocation, LayoutSize(m_logicalWidth, m_height));
+    if (visibleToHitTesting() && boundsRect.intersects(HitTestLocation::rectForPoint(locationInContainer.point(), 0, 0, 0, 0))) {
+        renderer()->updateHitTestResult(result, locationInContainer.point() - toLayoutSize(adjustedLocation));
+        if (!result.addNodeToRectBasedTestResult(renderer()->node(), request, locationInContainer, boundsRect))
+            return true;
+    }
+
     return false;
 }

trunk/Source/WebCore/rendering/EllipsisBox.h

@@ -50 +50 @@
     virtual RenderObject::SelectionState selectionState() { return m_selectionState; }
     void paintSelection(GraphicsContext*, const LayoutPoint&, RenderStyle*, const Font&);
+    InlineBox* markupBox() const;
 
     bool m_shouldPaintMarkupBox;