Merge WebKit at r68651 : Initial merge by git.

Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12

1 files changed, 4 insertions, 4 deletions

diff --git a/WebCore/rendering/RenderLineBoxList.cpp b/WebCore/rendering/RenderLineBoxList.cpp
index 45e66eb..760d2ea 100644
--- a/WebCore/rendering/RenderLineBoxList.cpp
+++ b/WebCore/rendering/RenderLineBoxList.cpp
@@ -246,16 +246,16 @@ bool RenderLineBoxList::hitTest(RenderBoxModelObject* renderer, const HitTestReq
     // contain the point.  This is a quick short-circuit that we can take to avoid walking any lines.
     // FIXME: This check is flawed in the following extremely obscure way:
     // if some line in the middle has a huge overflow, it might actually extend below the last line.
-    if (y - result.paddingHeight() >= ty + lastLineBox()->root()->bottomVisibleOverflow()
-     || y + result.paddingHeight() < ty + firstLineBox()->root()->topVisibleOverflow())
+    if (y - result.topPadding() >= ty + lastLineBox()->root()->bottomVisibleOverflow()
+     || y + result.bottomPadding() < ty + firstLineBox()->root()->topVisibleOverflow())
         return false;
 
     // See if our root lines contain the point.  If so, then we hit test
     // them further.  Note that boxes can easily overlap, so we can't make any assumptions
     // based off positions of our first line box or our last line box.
     for (InlineFlowBox* curr = lastLineBox(); curr; curr = curr->prevLineBox()) {
-        if (y + result.paddingHeight() >= ty + curr->root()->topVisibleOverflow()
-         && y - result.paddingHeight() < ty + curr->root()->bottomVisibleOverflow()) {
+        if (y + result.bottomPadding() >= ty + curr->root()->topVisibleOverflow()
+         && y - result.topPadding() < ty + curr->root()->bottomVisibleOverflow()) {
             bool inside = curr->nodeAtPoint(request, result, x, y, tx, ty);
             if (inside) {
                 renderer->updateHitTestResult(result, IntPoint(x - tx, y - ty));