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

Unified Diff: Source/core/page/FocusController.h

Issue 189573002: Convert HTMLFrameOwnerElement and FocusController to use Frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Missed a null check Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/FocusController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/FocusController.h
diff --git a/Source/core/page/FocusController.h b/Source/core/page/FocusController.h
index b7d919c64262feeacfa58b70795d9f1d6c38db3b..0983fcd5ce7589873dd3aef13ca5b4b72750fd37 100644
--- a/Source/core/page/FocusController.h
+++ b/Source/core/page/FocusController.h
@@ -37,7 +37,7 @@ namespace WebCore {
struct FocusCandidate;
class Document;
class Element;
-class LocalFrame;
+class Frame;
class HTMLFrameOwnerElement;
class HTMLShadowElement;
class IntRect;
@@ -66,14 +66,14 @@ class FocusController {
public:
static PassOwnPtr<FocusController> create(Page*);
- void setFocusedFrame(PassRefPtr<LocalFrame>);
- LocalFrame* focusedFrame() const { return m_focusedFrame.get(); }
- LocalFrame* focusedOrMainFrame() const;
+ void setFocusedFrame(PassRefPtr<Frame>);
+ Frame* focusedFrame() const { return m_focusedFrame.get(); }
+ Frame* focusedOrMainFrame() const;
bool setInitialFocus(FocusType);
bool advanceFocus(FocusType type) { return advanceFocus(type, false); }
- bool setFocusedElement(Element*, PassRefPtr<LocalFrame>, FocusType = FocusTypeNone);
+ bool setFocusedElement(Element*, PassRefPtr<Frame>, FocusType = FocusTypeNone);
void setActive(bool);
bool isActive() const { return m_isActive; }
@@ -115,7 +115,7 @@ private:
void findFocusCandidateInContainer(Node& container, const LayoutRect& startingRect, FocusType, FocusCandidate& closest);
Page* m_page;
- RefPtr<LocalFrame> m_focusedFrame;
+ RefPtr<Frame> m_focusedFrame;
bool m_isActive;
bool m_isFocused;
bool m_isChangingFocusedFrame;
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/FocusController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698