| Index: Source/core/page/FocusController.cpp
|
| diff --git a/Source/core/page/FocusController.cpp b/Source/core/page/FocusController.cpp
|
| index a75d57d3133212b33f5bc2a06b9c2ae0bed5029f..f84cd1284f9efe47ae081cc163a6e2057be7b46d 100644
|
| --- a/Source/core/page/FocusController.cpp
|
| +++ b/Source/core/page/FocusController.cpp
|
| @@ -224,7 +224,6 @@ FocusController::FocusController(Page* page)
|
| , m_isActive(false)
|
| , m_isFocused(false)
|
| , m_isChangingFocusedFrame(false)
|
| - , m_containingWindowIsVisible(false)
|
| {
|
| }
|
|
|
| @@ -693,45 +692,6 @@ void FocusController::setActive(bool active)
|
| toLocalFrame(focusedOrMainFrame())->selection().pageActivationChanged();
|
| }
|
|
|
| -static void contentAreaDidShowOrHide(ScrollableArea* scrollableArea, bool didShow)
|
| -{
|
| - if (didShow)
|
| - scrollableArea->contentAreaDidShow();
|
| - else
|
| - scrollableArea->contentAreaDidHide();
|
| -}
|
| -
|
| -void FocusController::setContainingWindowIsVisible(bool containingWindowIsVisible)
|
| -{
|
| - if (m_containingWindowIsVisible == containingWindowIsVisible)
|
| - return;
|
| -
|
| - m_containingWindowIsVisible = containingWindowIsVisible;
|
| -
|
| - FrameView* view = m_page->mainFrame()->view();
|
| - if (!view)
|
| - return;
|
| -
|
| - contentAreaDidShowOrHide(view, containingWindowIsVisible);
|
| -
|
| - for (LocalFrame* frame = m_page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
|
| - FrameView* frameView = frame->view();
|
| - if (!frameView)
|
| - continue;
|
| -
|
| - const HashSet<ScrollableArea*>* scrollableAreas = frameView->scrollableAreas();
|
| - if (!scrollableAreas)
|
| - continue;
|
| -
|
| - for (HashSet<ScrollableArea*>::const_iterator it = scrollableAreas->begin(), end = scrollableAreas->end(); it != end; ++it) {
|
| - ScrollableArea* scrollableArea = *it;
|
| - ASSERT(scrollableArea->scrollbarsCanBeActive());
|
| -
|
| - contentAreaDidShowOrHide(scrollableArea, containingWindowIsVisible);
|
| - }
|
| - }
|
| -}
|
| -
|
| static void updateFocusCandidateIfNeeded(FocusType type, const FocusCandidate& current, FocusCandidate& candidate, FocusCandidate& closest)
|
| {
|
| ASSERT(candidate.visibleNode->isElementNode());
|
|
|