Source/core/page/SpatialNavigation.cpp - Issue 336553003: Change Page::m_mainFrame to be a Frame.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/page/SpatialNavigation.cpp

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Android/Mac fixes Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Source/core/page/SpatialNavigation.cpp

diff --git a/Source/core/page/SpatialNavigation.cpp b/Source/core/page/SpatialNavigation.cpp

index 895c4561ba333c9eb9465e8d443fee99fe0fb271..2f5b4083c1d8a6a24ac05d2bab0ab127839fc097 100644

--- a/Source/core/page/SpatialNavigation.cpp

+++ b/Source/core/page/SpatialNavigation.cpp

@@ -690,7 +690,8 @@ void distanceDataForNode(FocusType type, const FocusCandidate& current, FocusCan

// Distance calculation is based on http://www.w3.org/TR/WICD/#focus-handling

candidate.distance = sqrt(euclidianDistancePow2) + navigationAxisDistance+ orthogonalAxisDistance * 2 - sqrt(overlap);

- LayoutSize viewSize = candidate.visibleNode->document().page()->mainFrame()->view()->visibleContentRect().size();

+ // FIXME: Doesn't work with OOPI.

+ LayoutSize viewSize = toLocalFrame(candidate.visibleNode->document().page()->mainFrame())->view()->visibleContentRect().size();

candidate.alignment = alignmentForRects(type, currentRect, nodeRect, viewSize);

}