Chromium Code Reviews| Index: Source/core/page/FocusController.h |
| diff --git a/Source/core/page/FocusController.h b/Source/core/page/FocusController.h |
| index f12d1a0d738e38327a99abeefbd46d7ded4fe986..2bc2551edc41ed7b0ce2642c7498ed561b24bb98 100644 |
| --- a/Source/core/page/FocusController.h |
| +++ b/Source/core/page/FocusController.h |
| @@ -63,20 +63,20 @@ private: |
| RawPtrWillBeMember<TreeScope> m_rootTreeScope; |
| }; |
| -class FocusController { |
| - WTF_MAKE_NONCOPYABLE(FocusController); WTF_MAKE_FAST_ALLOCATED; |
| +class FocusController FINAL : public NoBaseWillBeGarbageCollectedFinalized<FocusController> { |
| + WTF_MAKE_NONCOPYABLE(FocusController); WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; |
| public: |
| - static PassOwnPtr<FocusController> create(Page*); |
| + static PassOwnPtrWillBeRawPtr<FocusController> create(Page*); |
| - void setFocusedFrame(PassRefPtr<Frame>); |
| - void focusDocumentView(PassRefPtr<Frame>); |
| + void setFocusedFrame(PassRefPtrWillBeRawPtr<Frame>); |
| + void focusDocumentView(PassRefPtrWillBeRawPtr<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<Frame>, FocusType = FocusTypeNone); |
| + bool setFocusedElement(Element*, PassRefPtrWillBeRawPtr<Frame>, FocusType = FocusTypeNone); |
| void setActive(bool); |
| bool isActive() const { return m_isActive; } |
| @@ -84,6 +84,8 @@ public: |
| void setFocused(bool); |
| bool isFocused() const { return m_isFocused; } |
| + void trace(Visitor*); |
| + |
| private: |
| explicit FocusController(Page*); |
| @@ -115,7 +117,7 @@ private: |
| void findFocusCandidateInContainer(Node& container, const LayoutRect& startingRect, FocusType, FocusCandidate& closest); |
| Page* m_page; |
|
haraken
2014/09/08 07:25:59
You can use Member<Page>.
sof
2014/09/08 21:17:46
Done.
|
| - RefPtr<Frame> m_focusedFrame; |
| + RefPtrWillBeMember<Frame> m_focusedFrame; |
| bool m_isActive; |
| bool m_isFocused; |
| bool m_isChangingFocusedFrame; |