OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved. |
3 * Copyright (C) 2008 Nuanti Ltd. | 3 * Copyright (C) 2008 Nuanti Ltd. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
633 } | 633 } |
634 | 634 |
635 void FocusController::setActive(bool active) | 635 void FocusController::setActive(bool active) |
636 { | 636 { |
637 if (m_isActive == active) | 637 if (m_isActive == active) |
638 return; | 638 return; |
639 | 639 |
640 m_isActive = active; | 640 m_isActive = active; |
641 | 641 |
642 if (FrameView* view = m_page->mainFrame()->view()) { | 642 if (FrameView* view = m_page->mainFrame()->view()) { |
643 if (!view->platformWidget()) { | 643 view->updateLayoutAndStyleIfNeededRecursive(); |
644 view->updateLayoutAndStyleIfNeededRecursive(); | 644 view->updateControlTints(); |
645 view->updateControlTints(); | |
646 } | |
647 } | 645 } |
648 | 646 |
649 focusedOrMainFrame()->selection()->pageActivationChanged(); | 647 focusedOrMainFrame()->selection()->pageActivationChanged(); |
650 | 648 |
651 if (m_focusedFrame && isFocused()) | 649 if (m_focusedFrame && isFocused()) |
652 dispatchEventsOnWindowAndFocusedNode(m_focusedFrame->document(), active)
; | 650 dispatchEventsOnWindowAndFocusedNode(m_focusedFrame->document(), active)
; |
653 } | 651 } |
654 | 652 |
655 static void contentAreaDidShowOrHide(ScrollableArea* scrollableArea, bool didSho
w) | 653 static void contentAreaDidShowOrHide(ScrollableArea* scrollableArea, bool didSho
w) |
656 { | 654 { |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
873 startingRect = nodeRectInAbsoluteCoordinates(container, true /* ignore b
order */); | 871 startingRect = nodeRectInAbsoluteCoordinates(container, true /* ignore b
order */); |
874 container = scrollableEnclosingBoxOrParentFrameForNodeInDirection(direct
ion, container); | 872 container = scrollableEnclosingBoxOrParentFrameForNodeInDirection(direct
ion, container); |
875 if (container && container->isDocumentNode()) | 873 if (container && container->isDocumentNode()) |
876 toDocument(container)->updateLayoutIgnorePendingStylesheets(); | 874 toDocument(container)->updateLayoutIgnorePendingStylesheets(); |
877 } while (!consumed && container); | 875 } while (!consumed && container); |
878 | 876 |
879 return consumed; | 877 return consumed; |
880 } | 878 } |
881 | 879 |
882 } // namespace WebCore | 880 } // namespace WebCore |
OLD | NEW |