| 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 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 720 if (m_isActive == active) | 720 if (m_isActive == active) |
| 721 return; | 721 return; |
| 722 | 722 |
| 723 m_isActive = active; | 723 m_isActive = active; |
| 724 | 724 |
| 725 if (m_page->mainFrame()->isLocalFrame()) { | 725 if (m_page->mainFrame()->isLocalFrame()) { |
| 726 if (FrameView* view = m_page->deprecatedLocalMainFrame()->view()) | 726 if (FrameView* view = m_page->deprecatedLocalMainFrame()->view()) |
| 727 view->updateControlTints(); | 727 view->updateControlTints(); |
| 728 } | 728 } |
| 729 | 729 |
| 730 toLocalFrame(focusedOrMainFrame())->selection().pageActivationChanged(); | 730 Frame* frame = focusedOrMainFrame(); |
| 731 if (frame->isLocalFrame()) |
| 732 toLocalFrame(frame)->selection().pageActivationChanged(); |
| 731 } | 733 } |
| 732 | 734 |
| 733 static void updateFocusCandidateIfNeeded(FocusType type, const FocusCandidate& c
urrent, FocusCandidate& candidate, FocusCandidate& closest) | 735 static void updateFocusCandidateIfNeeded(FocusType type, const FocusCandidate& c
urrent, FocusCandidate& candidate, FocusCandidate& closest) |
| 734 { | 736 { |
| 735 ASSERT(candidate.visibleNode->isElementNode()); | 737 ASSERT(candidate.visibleNode->isElementNode()); |
| 736 ASSERT(candidate.visibleNode->renderer()); | 738 ASSERT(candidate.visibleNode->renderer()); |
| 737 | 739 |
| 738 // Ignore iframes that don't have a src attribute | 740 // Ignore iframes that don't have a src attribute |
| 739 if (frameOwnerElement(candidate) && (!frameOwnerElement(candidate)->contentF
rame() || candidate.rect.isEmpty())) | 741 if (frameOwnerElement(candidate) && (!frameOwnerElement(candidate)->contentF
rame() || candidate.rect.isEmpty())) |
| 740 return; | 742 return; |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 917 startingRect = nodeRectInAbsoluteCoordinates(container, true /* ignore b
order */); | 919 startingRect = nodeRectInAbsoluteCoordinates(container, true /* ignore b
order */); |
| 918 container = scrollableEnclosingBoxOrParentFrameForNodeInDirection(type,
container); | 920 container = scrollableEnclosingBoxOrParentFrameForNodeInDirection(type,
container); |
| 919 if (container && container->isDocumentNode()) | 921 if (container && container->isDocumentNode()) |
| 920 toDocument(container)->updateLayoutIgnorePendingStylesheets(); | 922 toDocument(container)->updateLayoutIgnorePendingStylesheets(); |
| 921 } while (!consumed && container); | 923 } while (!consumed && container); |
| 922 | 924 |
| 923 return consumed; | 925 return consumed; |
| 924 } | 926 } |
| 925 | 927 |
| 926 } // namespace WebCore | 928 } // namespace WebCore |
| OLD | NEW |