| 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);
|
| }
|
|
|