| Index: third_party/WebKit/Source/web/RemoteBridgeFrameOwner.h
|
| diff --git a/third_party/WebKit/Source/web/RemoteBridgeFrameOwner.h b/third_party/WebKit/Source/web/RemoteBridgeFrameOwner.h
|
| index 2b8e3586751b81771d39d7a1f072fc78b3a11751..82013b8c51113a974e7967f87cddcc619868d229 100644
|
| --- a/third_party/WebKit/Source/web/RemoteBridgeFrameOwner.h
|
| +++ b/third_party/WebKit/Source/web/RemoteBridgeFrameOwner.h
|
| @@ -17,12 +17,12 @@ namespace blink {
|
| // 1. Allows the local frame's loader to retrieve sandbox flags associated with
|
| // its owner element in another process.
|
| // 2. Trigger a load event on its owner element once it finishes a load.
|
| -class RemoteBridgeFrameOwner final : public NoBaseWillBeGarbageCollectedFinalized<RemoteBridgeFrameOwner>, public FrameOwner {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(RemoteBridgeFrameOwner);
|
| +class RemoteBridgeFrameOwner final : public GarbageCollectedFinalized<RemoteBridgeFrameOwner>, public FrameOwner {
|
| + USING_GARBAGE_COLLECTED_MIXIN(RemoteBridgeFrameOwner);
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<RemoteBridgeFrameOwner> create(PassRefPtrWillBeRawPtr<WebLocalFrameImpl> frame, SandboxFlags flags, const WebFrameOwnerProperties& frameOwnerProperties)
|
| + static RawPtr<RemoteBridgeFrameOwner> create(RawPtr<WebLocalFrameImpl> frame, SandboxFlags flags, const WebFrameOwnerProperties& frameOwnerProperties)
|
| {
|
| - return adoptPtrWillBeNoop(new RemoteBridgeFrameOwner(frame, flags, frameOwnerProperties));
|
| + return (new RemoteBridgeFrameOwner(frame, flags, frameOwnerProperties));
|
| }
|
|
|
| bool isLocal() const override
|
| @@ -40,7 +40,7 @@ public:
|
| m_sandboxFlags = flags;
|
| }
|
|
|
| - void setContentFrame(PassRefPtrWillBeRawPtr<WebLocalFrameImpl> frame)
|
| + void setContentFrame(RawPtr<WebLocalFrameImpl> frame)
|
| {
|
| m_frame = frame;
|
| }
|
| @@ -63,9 +63,9 @@ public:
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| private:
|
| - RemoteBridgeFrameOwner(PassRefPtrWillBeRawPtr<WebLocalFrameImpl>, SandboxFlags, const WebFrameOwnerProperties&);
|
| + RemoteBridgeFrameOwner(RawPtr<WebLocalFrameImpl>, SandboxFlags, const WebFrameOwnerProperties&);
|
|
|
| - RefPtrWillBeMember<WebLocalFrameImpl> m_frame;
|
| + Member<WebLocalFrameImpl> m_frame;
|
| SandboxFlags m_sandboxFlags;
|
| ScrollbarMode m_scrolling;
|
| int m_marginWidth;
|
|
|