Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Side by Side Diff: Source/core/page/FocusController.cpp

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/PageSerializer.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 // we invalidate from the root FrameView instead of just the focused. 813 // we invalidate from the root FrameView instead of just the focused.
814 if (FrameView* view = toLocalFrame(frame)->localFrameRoot()->document()- >view()) 814 if (FrameView* view = toLocalFrame(frame)->localFrameRoot()->document()- >view())
815 view->invalidateAllCustomScrollbarsOnActiveChanged(); 815 view->invalidateAllCustomScrollbarsOnActiveChanged();
816 toLocalFrame(frame)->selection().pageActivationChanged(); 816 toLocalFrame(frame)->selection().pageActivationChanged();
817 } 817 }
818 } 818 }
819 819
820 static void updateFocusCandidateIfNeeded(WebFocusType type, const FocusCandidate & current, FocusCandidate& candidate, FocusCandidate& closest) 820 static void updateFocusCandidateIfNeeded(WebFocusType type, const FocusCandidate & current, FocusCandidate& candidate, FocusCandidate& closest)
821 { 821 {
822 ASSERT(candidate.visibleNode->isElementNode()); 822 ASSERT(candidate.visibleNode->isElementNode());
823 ASSERT(candidate.visibleNode->renderer()); 823 ASSERT(candidate.visibleNode->layoutObject());
824 824
825 // Ignore iframes that don't have a src attribute 825 // Ignore iframes that don't have a src attribute
826 if (frameOwnerElement(candidate) && (!frameOwnerElement(candidate)->contentF rame() || candidate.rect.isEmpty())) 826 if (frameOwnerElement(candidate) && (!frameOwnerElement(candidate)->contentF rame() || candidate.rect.isEmpty()))
827 return; 827 return;
828 828
829 // Ignore off screen child nodes of containers that do not scroll (overflow: hidden) 829 // Ignore off screen child nodes of containers that do not scroll (overflow: hidden)
830 if (candidate.isOffscreen && !canBeScrolledIntoView(type, candidate)) 830 if (candidate.isOffscreen && !canBeScrolledIntoView(type, candidate))
831 return; 831 return;
832 832
833 distanceDataForNode(type, current, candidate); 833 distanceDataForNode(type, current, candidate);
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
1004 return consumed; 1004 return consumed;
1005 } 1005 }
1006 1006
1007 DEFINE_TRACE(FocusController) 1007 DEFINE_TRACE(FocusController)
1008 { 1008 {
1009 visitor->trace(m_page); 1009 visitor->trace(m_page);
1010 visitor->trace(m_focusedFrame); 1010 visitor->trace(m_focusedFrame);
1011 } 1011 }
1012 1012
1013 } // namespace blink 1013 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/PageSerializer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698