diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/page/FocusController.cpp | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/page/FocusController.cpp')
-rw-r--r-- | Source/WebCore/page/FocusController.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Source/WebCore/page/FocusController.cpp b/Source/WebCore/page/FocusController.cpp index 10901c5..41cfee4 100644 --- a/Source/WebCore/page/FocusController.cpp +++ b/Source/WebCore/page/FocusController.cpp @@ -301,7 +301,7 @@ bool FocusController::advanceFocusInDocumentOrder(FocusDirection direction, Keyb static bool relinquishesEditingFocus(Node *node) { ASSERT(node); - ASSERT(node->isContentEditable()); + ASSERT(node->rendererIsEditable()); Node* root = node->rootEditableElement(); Frame* frame = node->document()->frame(); @@ -410,11 +410,16 @@ void FocusController::setActive(bool active) view->updateLayoutAndStyleIfNeededRecursive(); view->updateControlTints(); } - // FIXME: This should propogate to all ScrollableAreas. - if (!active) - view->scrollAnimator()->contentAreaDidHide(); - else - view->scrollAnimator()->contentAreaDidShow(); + + if (const HashSet<ScrollableArea*>* scrollableAreas = m_page->scrollableAreaSet()) { + HashSet<ScrollableArea*>::const_iterator end = scrollableAreas->end(); + for (HashSet<ScrollableArea*>::const_iterator it = scrollableAreas->begin(); it != end; ++it) { + if (!active) + (*it)->scrollAnimator()->contentAreaDidHide(); + else + (*it)->scrollAnimator()->contentAreaDidShow(); + } + } } focusedOrMainFrame()->selection()->pageActivationChanged(); |