summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebKit/android/nav/CachedFrame.cpp3
-rw-r--r--WebKit/android/nav/CachedRoot.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/android/nav/CachedFrame.cpp b/WebKit/android/nav/CachedFrame.cpp
index 416e880..955a439 100644
--- a/WebKit/android/nav/CachedFrame.cpp
+++ b/WebKit/android/nav/CachedFrame.cpp
@@ -578,6 +578,9 @@ void CachedFrame::finishInit()
child->finishInit();
child++;
}
+ CachedFrame* frameParent;
+ if (mFocusIndex >= 0 && (frameParent = parent()))
+ frameParent->setFocusIndex(indexInParent());
}
const CachedNode* CachedFrame::frameDown(const CachedNode* test, const CachedNode* limit, BestData* bestData,
diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp
index 102da39..595b4b5 100644
--- a/WebKit/android/nav/CachedRoot.cpp
+++ b/WebKit/android/nav/CachedRoot.cpp
@@ -1256,7 +1256,7 @@ void CachedRoot::setCachedFocus(CachedFrame* frame, CachedNode* node)
frame = parent;
}
#if DEBUG_NAV_UI
- const CachedNode* focus = currentFocus();
+ const CachedNode* focus = frame->currentFocus();
WebCore::IntRect bounds = WebCore::IntRect(0, 0, 0, 0);
if (focus)
bounds = focus->bounds();