| OLD | NEW |
| 1 /** | 1 /** |
| 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. | 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 if (InlineBox* markupBox = this->markupBox()) { | 72 if (InlineBox* markupBox = this->markupBox()) { |
| 73 RenderStyle* style = renderer().style(isFirstLineStyle()); | 73 RenderStyle* style = renderer().style(isFirstLineStyle()); |
| 74 LayoutUnit mtx = adjustedLocation.x() + m_logicalWidth - markupBox->x(); | 74 LayoutUnit mtx = adjustedLocation.x() + m_logicalWidth - markupBox->x(); |
| 75 LayoutUnit mty = adjustedLocation.y() + style->fontMetrics().ascent() -
(markupBox->y() + markupBox->renderer().style(isFirstLineStyle())->fontMetrics()
.ascent()); | 75 LayoutUnit mty = adjustedLocation.y() + style->fontMetrics().ascent() -
(markupBox->y() + markupBox->renderer().style(isFirstLineStyle())->fontMetrics()
.ascent()); |
| 76 if (markupBox->nodeAtPoint(request, result, locationInContainer, LayoutP
oint(mtx, mty), lineTop, lineBottom)) { | 76 if (markupBox->nodeAtPoint(request, result, locationInContainer, LayoutP
oint(mtx, mty), lineTop, lineBottom)) { |
| 77 renderer().updateHitTestResult(result, locationInContainer.point() -
LayoutSize(mtx, mty)); | 77 renderer().updateHitTestResult(result, locationInContainer.point() -
LayoutSize(mtx, mty)); |
| 78 return true; | 78 return true; |
| 79 } | 79 } |
| 80 } | 80 } |
| 81 | 81 |
| 82 FloatPoint boxOrigin = locationIncludingFlipping(); | 82 FloatPointWillBeLayoutPoint boxOrigin = locationIncludingFlipping(); |
| 83 boxOrigin.moveBy(accumulatedOffset); | 83 boxOrigin.moveBy(accumulatedOffset); |
| 84 FloatRect boundsRect(boxOrigin, size()); | 84 FloatRectWillBeLayoutRect boundsRect(boxOrigin, size()); |
| 85 if (visibleToHitTestRequest(request) && boundsRect.intersects(HitTestLocatio
n::rectForPoint(locationInContainer.point(), 0, 0, 0, 0))) { | 85 if (visibleToHitTestRequest(request) && boundsRect.intersects(HitTestLocatio
n::rectForPoint(locationInContainer.point(), 0, 0, 0, 0))) { |
| 86 renderer().updateHitTestResult(result, locationInContainer.point() - toL
ayoutSize(adjustedLocation)); | 86 renderer().updateHitTestResult(result, locationInContainer.point() - toL
ayoutSize(adjustedLocation)); |
| 87 if (!result.addNodeToRectBasedTestResult(renderer().node(), request, loc
ationInContainer, boundsRect)) | 87 if (!result.addNodeToRectBasedTestResult(renderer().node(), request, loc
ationInContainer, boundsRect)) |
| 88 return true; | 88 return true; |
| 89 } | 89 } |
| 90 | 90 |
| 91 return false; | 91 return false; |
| 92 } | 92 } |
| 93 | 93 |
| 94 } // namespace blink | 94 } // namespace blink |
| OLD | NEW |