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

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

Issue 13851023: Remove ChromeClient cruft (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Patch for landing Created 7 years, 7 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/ChromeClient.h ('k') | Source/core/platform/HostWindow.h » ('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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 if (oldFrame && oldFrame->view()) { 190 if (oldFrame && oldFrame->view()) {
191 oldFrame->selection()->setFocused(false); 191 oldFrame->selection()->setFocused(false);
192 oldFrame->document()->dispatchWindowEvent(Event::create(eventNames().blu rEvent, false, false)); 192 oldFrame->document()->dispatchWindowEvent(Event::create(eventNames().blu rEvent, false, false));
193 } 193 }
194 194
195 if (newFrame && newFrame->view() && isFocused()) { 195 if (newFrame && newFrame->view() && isFocused()) {
196 newFrame->selection()->setFocused(true); 196 newFrame->selection()->setFocused(true);
197 newFrame->document()->dispatchWindowEvent(Event::create(eventNames().foc usEvent, false, false)); 197 newFrame->document()->dispatchWindowEvent(Event::create(eventNames().foc usEvent, false, false));
198 } 198 }
199 199
200 m_page->chrome()->focusedFrameChanged(newFrame.get());
201
202 m_isChangingFocusedFrame = false; 200 m_isChangingFocusedFrame = false;
203 } 201 }
204 202
205 Frame* FocusController::focusedOrMainFrame() const 203 Frame* FocusController::focusedOrMainFrame() const
206 { 204 {
207 if (Frame* frame = focusedFrame()) 205 if (Frame* frame = focusedFrame())
208 return frame; 206 return frame;
209 return m_page->mainFrame(); 207 return m_page->mainFrame();
210 } 208 }
211 209
(...skipping 659 matching lines...) Expand 10 before | Expand all | Expand 10 after
871 startingRect = nodeRectInAbsoluteCoordinates(container, true /* ignore b order */); 869 startingRect = nodeRectInAbsoluteCoordinates(container, true /* ignore b order */);
872 container = scrollableEnclosingBoxOrParentFrameForNodeInDirection(direct ion, container); 870 container = scrollableEnclosingBoxOrParentFrameForNodeInDirection(direct ion, container);
873 if (container && container->isDocumentNode()) 871 if (container && container->isDocumentNode())
874 toDocument(container)->updateLayoutIgnorePendingStylesheets(); 872 toDocument(container)->updateLayoutIgnorePendingStylesheets();
875 } while (!consumed && container); 873 } while (!consumed && container);
876 874
877 return consumed; 875 return consumed;
878 } 876 }
879 877
880 } // namespace WebCore 878 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/ChromeClient.h ('k') | Source/core/platform/HostWindow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698