| Index: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
|
| index a562da2316e9bce2e7bca7fad0ec2bc3e154a0a0..499a9f279f370d08901aaeab00fbd58f0f1a959d 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
|
| +++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
|
| @@ -39,7 +39,7 @@ class LayoutPart;
|
| class Widget;
|
|
|
| class CORE_EXPORT HTMLFrameOwnerElement : public HTMLElement, public FrameOwner {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLFrameOwnerElement);
|
| + USING_GARBAGE_COLLECTED_MIXIN(HTMLFrameOwnerElement);
|
| public:
|
| ~HTMLFrameOwnerElement() override;
|
|
|
| @@ -59,8 +59,8 @@ public:
|
| virtual bool loadedNonEmptyDocument() const { return false; }
|
| virtual void didLoadNonEmptyDocument() { }
|
|
|
| - void setWidget(PassRefPtrWillBeRawPtr<Widget>);
|
| - PassRefPtrWillBeRawPtr<Widget> releaseWidget();
|
| + void setWidget(RawPtr<Widget>);
|
| + RawPtr<Widget> releaseWidget();
|
| Widget* ownedWidget() const;
|
|
|
| class UpdateSuspendScope {
|
| @@ -99,8 +99,8 @@ private:
|
|
|
| virtual ReferrerPolicy referrerPolicyAttribute() { return ReferrerPolicyDefault; }
|
|
|
| - RawPtrWillBeMember<Frame> m_contentFrame;
|
| - RefPtrWillBeMember<Widget> m_widget;
|
| + Member<Frame> m_contentFrame;
|
| + Member<Widget> m_widget;
|
| SandboxFlags m_sandboxFlags;
|
| };
|
|
|
| @@ -136,9 +136,9 @@ public:
|
| }
|
|
|
| private:
|
| - CORE_EXPORT static WillBeHeapHashCountedSet<RawPtrWillBeMember<Node>>& disabledSubtreeRoots();
|
| + CORE_EXPORT static HeapHashCountedSet<Member<Node>>& disabledSubtreeRoots();
|
|
|
| - RawPtrWillBeMember<Node> m_root;
|
| + Member<Node> m_root;
|
| };
|
|
|
| DEFINE_TYPE_CASTS(HTMLFrameOwnerElement, FrameOwner, owner, owner->isLocal(), owner.isLocal());
|
|
|