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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
Index: third_party/WebKit/Source/core/page/FocusController.h
diff --git a/third_party/WebKit/Source/core/page/FocusController.h b/third_party/WebKit/Source/core/page/FocusController.h
index 1754787e7f1b2ae1285887e8b7c5807be9f6d18b..c4c2370fb8bb84fe818b1c9846a07e646357bc28 100644
--- a/third_party/WebKit/Source/core/page/FocusController.h
+++ b/third_party/WebKit/Source/core/page/FocusController.h
@@ -48,13 +48,13 @@ class Node;
class Page;
class RemoteFrame;
-class CORE_EXPORT FocusController final : public NoBaseWillBeGarbageCollectedFinalized<FocusController> {
- WTF_MAKE_NONCOPYABLE(FocusController); USING_FAST_MALLOC_WILL_BE_REMOVED(FocusController);
+class CORE_EXPORT FocusController final : public GarbageCollectedFinalized<FocusController> {
+ WTF_MAKE_NONCOPYABLE(FocusController);
public:
- static PassOwnPtrWillBeRawPtr<FocusController> create(Page*);
+ static RawPtr<FocusController> create(Page*);
- void setFocusedFrame(PassRefPtrWillBeRawPtr<Frame>, bool notifyEmbedder = true);
- void focusDocumentView(PassRefPtrWillBeRawPtr<Frame>, bool notifyEmbedder = true);
+ void setFocusedFrame(RawPtr<Frame>, bool notifyEmbedder = true);
+ void focusDocumentView(RawPtr<Frame>, bool notifyEmbedder = true);
LocalFrame* focusedFrame() const;
Frame* focusedOrMainFrame() const;
@@ -72,10 +72,10 @@ public:
bool advanceFocusAcrossFrames(WebFocusType, RemoteFrame* from, LocalFrame* to, InputDeviceCapabilities* sourceCapabilities = nullptr);
Element* findFocusableElementInShadowHost(const Element& shadowHost);
- bool setFocusedElement(Element*, PassRefPtrWillBeRawPtr<Frame>, const FocusParams&);
+ bool setFocusedElement(Element*, RawPtr<Frame>, const FocusParams&);
// |setFocusedElement| variant with SelectionBehaviorOnFocus::None,
// |WebFocusTypeNone, and null InputDeviceCapabilities.
- bool setFocusedElement(Element*, PassRefPtrWillBeRawPtr<Frame>);
+ bool setFocusedElement(Element*, RawPtr<Frame>);
void setActive(bool);
bool isActive() const { return m_isActive; }
@@ -97,8 +97,8 @@ private:
bool advanceFocusDirectionallyInContainer(Node* container, const LayoutRect& startingRect, WebFocusType);
void findFocusCandidateInContainer(Node& container, const LayoutRect& startingRect, WebFocusType, FocusCandidate& closest);
- RawPtrWillBeMember<Page> m_page;
- RefPtrWillBeMember<Frame> m_focusedFrame;
+ Member<Page> m_page;
+ Member<Frame> m_focusedFrame;
bool m_isActive;
bool m_isFocused;
bool m_isChangingFocusedFrame;
« no previous file with comments | « third_party/WebKit/Source/core/page/EventSource.cpp ('k') | third_party/WebKit/Source/core/page/FocusController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698