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

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.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, 10 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/frame/LocalFrame.h
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.h b/third_party/WebKit/Source/core/frame/LocalFrame.h
index 9288d04b696497740a111ef2599a1a5b2cd02a27..46bd46a3260b5791c0c23e6a05421c825f84bd84 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.h
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.h
@@ -76,13 +76,13 @@ class WebFrameHostScheduler;
class WebFrameScheduler;
template <typename Strategy> class PositionWithAffinityTemplate;
-class CORE_EXPORT LocalFrame : public Frame, public LocalFrameLifecycleNotifier, public WillBeHeapSupplementable<LocalFrame>, public DisplayItemClient {
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LocalFrame);
+class CORE_EXPORT LocalFrame : public Frame, public LocalFrameLifecycleNotifier, public HeapSupplementable<LocalFrame>, public DisplayItemClient {
+ USING_GARBAGE_COLLECTED_MIXIN(LocalFrame);
public:
- static PassRefPtrWillBeRawPtr<LocalFrame> create(FrameLoaderClient*, FrameHost*, FrameOwner*);
+ static RawPtr<LocalFrame> create(FrameLoaderClient*, FrameHost*, FrameOwner*);
void init();
- void setView(PassRefPtrWillBeRawPtr<FrameView>);
+ void setView(RawPtr<FrameView>);
void createView(const IntSize&, const Color&, bool,
ScrollbarMode = ScrollbarAuto, bool horizontalLock = false,
ScrollbarMode = ScrollbarAuto, bool verticalLock = false);
@@ -106,7 +106,7 @@ public:
void willDetachFrameHost();
LocalDOMWindow* localDOMWindow() const;
- void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>);
+ void setDOMWindow(RawPtr<LocalDOMWindow>);
FrameView* view() const;
Document* document() const;
void setPagePopupOwner(Element&);
@@ -208,20 +208,20 @@ private:
void disableNavigation() { ++m_navigationDisableCount; }
mutable FrameLoader m_loader;
- OwnPtrWillBeMember<NavigationScheduler> m_navigationScheduler;
+ Member<NavigationScheduler> m_navigationScheduler;
- RefPtrWillBeMember<FrameView> m_view;
- RefPtrWillBeMember<LocalDOMWindow> m_domWindow;
+ Member<FrameView> m_view;
+ Member<LocalDOMWindow> m_domWindow;
// Usually 0. Non-null if this is the top frame of PagePopup.
- RefPtrWillBeMember<Element> m_pagePopupOwner;
-
- const OwnPtrWillBeMember<ScriptController> m_script;
- const OwnPtrWillBeMember<Editor> m_editor;
- const OwnPtrWillBeMember<SpellChecker> m_spellChecker;
- const OwnPtrWillBeMember<FrameSelection> m_selection;
- const OwnPtrWillBeMember<EventHandler> m_eventHandler;
- const OwnPtrWillBeMember<FrameConsole> m_console;
- const OwnPtrWillBeMember<InputMethodController> m_inputMethodController;
+ Member<Element> m_pagePopupOwner;
+
+ const Member<ScriptController> m_script;
+ const Member<Editor> m_editor;
+ const Member<SpellChecker> m_spellChecker;
+ const Member<FrameSelection> m_selection;
+ const Member<EventHandler> m_eventHandler;
+ const Member<FrameConsole> m_console;
+ const Member<InputMethodController> m_inputMethodController;
OwnPtr<WebFrameScheduler> m_frameScheduler;
int m_navigationDisableCount;
@@ -231,7 +231,7 @@ private:
bool m_inViewSourceMode;
- RefPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;
+ Member<InstrumentingAgents> m_instrumentingAgents;
};
inline void LocalFrame::init()
@@ -318,7 +318,7 @@ public:
~FrameNavigationDisabler();
private:
- RawPtrWillBeMember<LocalFrame> m_frame;
+ Member<LocalFrame> m_frame;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698