| Index: third_party/WebKit/Source/core/frame/RemoteDOMWindow.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/RemoteDOMWindow.cpp b/third_party/WebKit/Source/core/frame/RemoteDOMWindow.cpp
|
| index 52c42c2dbddd071088e9ae30ae90bc127b9b26d0..706ee2ad8e1138ec64b2766f05c87088922571be 100644
|
| --- a/third_party/WebKit/Source/core/frame/RemoteDOMWindow.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/RemoteDOMWindow.cpp
|
| @@ -18,14 +18,9 @@ ExecutionContext* RemoteDOMWindow::getExecutionContext() const {
|
| }
|
|
|
| DEFINE_TRACE(RemoteDOMWindow) {
|
| - visitor->trace(m_frame);
|
| DOMWindow::trace(visitor);
|
| }
|
|
|
| -RemoteFrame* RemoteDOMWindow::frame() const {
|
| - return m_frame.get();
|
| -}
|
| -
|
| Screen* RemoteDOMWindow::screen() const {
|
| ASSERT_NOT_REACHED();
|
| return nullptr;
|
| @@ -290,16 +285,16 @@ CustomElementRegistry* RemoteDOMWindow::customElements(ScriptState*) const {
|
| return nullptr;
|
| }
|
|
|
| -RemoteDOMWindow::RemoteDOMWindow(RemoteFrame& frame) : m_frame(&frame) {}
|
| +RemoteDOMWindow::RemoteDOMWindow(RemoteFrame& frame) : DOMWindow(frame) {}
|
|
|
| void RemoteDOMWindow::frameDetached() {
|
| - m_frame = nullptr;
|
| + disconnectFromFrame();
|
| }
|
|
|
| void RemoteDOMWindow::schedulePostMessage(MessageEvent* event,
|
| PassRefPtr<SecurityOrigin> target,
|
| Document* source) {
|
| - m_frame->client()->forwardPostMessage(event, std::move(target),
|
| + frame()->client()->forwardPostMessage(event, std::move(target),
|
| source->frame());
|
| }
|
|
|
|
|