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

Unified Diff: third_party/WebKit/Source/core/frame/FrameOwner.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/frame/FrameOwner.h
diff --git a/third_party/WebKit/Source/core/frame/FrameOwner.h b/third_party/WebKit/Source/core/frame/FrameOwner.h
index c48bfbe3aa44340cb0c20bdf66f84534a0b585dc..95fe6e0e4ecadd5a2ed51a46fd55ba35e55803e8 100644
--- a/third_party/WebKit/Source/core/frame/FrameOwner.h
+++ b/third_party/WebKit/Source/core/frame/FrameOwner.h
@@ -17,7 +17,7 @@ class Frame;
// Oilpan: all FrameOwner instances are GCed objects. FrameOwner additionally
// derives from GarbageCollectedMixin so that Member<FrameOwner> references can
// be kept (e.g., Frame::m_owner.)
-class CORE_EXPORT FrameOwner : public WillBeGarbageCollectedMixin {
+class CORE_EXPORT FrameOwner : public GarbageCollectedMixin {
public:
virtual ~FrameOwner() { }
DEFINE_INLINE_VIRTUAL_TRACE() { }
@@ -40,10 +40,10 @@ public:
virtual int marginHeight() const = 0;
};
-class CORE_EXPORT DummyFrameOwner : public NoBaseWillBeGarbageCollectedFinalized<DummyFrameOwner>, public FrameOwner {
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DummyFrameOwner);
+class CORE_EXPORT DummyFrameOwner : public GarbageCollectedFinalized<DummyFrameOwner>, public FrameOwner {
+ USING_GARBAGE_COLLECTED_MIXIN(DummyFrameOwner);
public:
- static PassOwnPtrWillBeRawPtr<DummyFrameOwner> create()
+ static RawPtr<DummyFrameOwner> create()
{
return adoptPtrWillBeNoop(new DummyFrameOwner);
}
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameHost.cpp ('k') | third_party/WebKit/Source/core/frame/FrameSerializer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698