From d06194330da2bb8da887d2e1adeacb3a5c1504b2 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 5 Jan 2011 12:15:11 +0000 Subject: Merge WebKit at r72805: Initial merge by Git Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790 --- WebCore/page/SpatialNavigation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebCore/page/SpatialNavigation.cpp') diff --git a/WebCore/page/SpatialNavigation.cpp b/WebCore/page/SpatialNavigation.cpp index ffc65b4..c7bdb51 100644 --- a/WebCore/page/SpatialNavigation.cpp +++ b/WebCore/page/SpatialNavigation.cpp @@ -626,7 +626,7 @@ bool canBeScrolledIntoView(FocusDirection direction, const FocusCandidate& candi { ASSERT(candidate.node && candidate.isOffscreen); IntRect candidateRect = candidate.rect; - for (Node* parentNode = candidate.node->parentNode(); parentNode; parentNode = parentNode->parentNode()) { + for (Node* parentNode = candidate.node->parent(); parentNode; parentNode = parentNode->parent()) { IntRect parentRect = nodeRectInAbsoluteCoordinates(parentNode); if (!candidateRect.intersects(parentRect)) { if (((direction == FocusDirectionLeft || direction == FocusDirectionRight) && parentNode->renderer()->style()->overflowX() == OHIDDEN) -- cgit v1.1