| Index: third_party/WebKit/Source/core/frame/RemoteFrame.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/RemoteFrame.cpp b/third_party/WebKit/Source/core/frame/RemoteFrame.cpp
|
| index ad1b727e0702f82e8f5f18dfdf36a2858c921183..05d15dfb03dadee11be190f5f4a92b5cdc472602 100644
|
| --- a/third_party/WebKit/Source/core/frame/RemoteFrame.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/RemoteFrame.cpp
|
| @@ -29,8 +29,10 @@ inline RemoteFrame::RemoteFrame(RemoteFrameClient* client,
|
| Page& page,
|
| FrameOwner* owner)
|
| : Frame(client, page, owner, RemoteWindowProxyManager::Create(*this)),
|
| - security_context_(RemoteSecurityContext::Create()) {
|
| + security_context_(RemoteSecurityContext::Create()),
|
| + last_inert_state_(false) {
|
| dom_window_ = RemoteDOMWindow::Create(*this);
|
| + UpdateInertIfPossible();
|
| }
|
|
|
| RemoteFrame* RemoteFrame::Create(RemoteFrameClient* client,
|
| @@ -121,6 +123,12 @@ bool RemoteFrame::ShouldClose() {
|
| return true;
|
| }
|
|
|
| +void RemoteFrame::SetIsInert(bool inert) {
|
| + if (inert != last_inert_state_)
|
| + Client()->SetIsInert(inert);
|
| + last_inert_state_ = inert;
|
| +}
|
| +
|
| void RemoteFrame::SetView(RemoteFrameView* view) {
|
| // Oilpan: as RemoteFrameView performs no finalization actions,
|
| // no explicit Dispose() of it needed here. (cf. LocalFrameView::Dispose().)
|
|
|