| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "core/frame/RemoteFrame.h" | 6 #include "core/frame/RemoteFrame.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/WindowProxy.h" | 8 #include "bindings/core/v8/WindowProxy.h" |
| 9 #include "bindings/core/v8/WindowProxyManager.h" | 9 #include "bindings/core/v8/WindowProxyManager.h" |
| 10 #include "core/dom/RemoteSecurityContext.h" | 10 #include "core/dom/RemoteSecurityContext.h" |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 void RemoteFrame::disconnectOwnerElement() | 113 void RemoteFrame::disconnectOwnerElement() |
| 114 { | 114 { |
| 115 // The RemotePlatformLayer needs to be cleared in disconnectOwnerElement() | 115 // The RemotePlatformLayer needs to be cleared in disconnectOwnerElement() |
| 116 // because it must happen on WebFrame::swap() and Frame::detach(). | 116 // because it must happen on WebFrame::swap() and Frame::detach(). |
| 117 if (m_remotePlatformLayer) | 117 if (m_remotePlatformLayer) |
| 118 setRemotePlatformLayer(nullptr); | 118 setRemotePlatformLayer(nullptr); |
| 119 | 119 |
| 120 Frame::disconnectOwnerElement(); | 120 Frame::disconnectOwnerElement(); |
| 121 } | 121 } |
| 122 | 122 |
| 123 bool RemoteFrame::shouldClose() |
| 124 { |
| 125 // TODO(nasko): Implement running the beforeunload handler in the actual |
| 126 // LocalFrame running in a different process and getting back a real result. |
| 127 return true; |
| 128 } |
| 129 |
| 123 void RemoteFrame::forwardInputEvent(Event* event) | 130 void RemoteFrame::forwardInputEvent(Event* event) |
| 124 { | 131 { |
| 125 remoteFrameClient()->forwardInputEvent(event); | 132 remoteFrameClient()->forwardInputEvent(event); |
| 126 } | 133 } |
| 127 | 134 |
| 128 void RemoteFrame::setView(PassRefPtrWillBeRawPtr<RemoteFrameView> view) | 135 void RemoteFrame::setView(PassRefPtrWillBeRawPtr<RemoteFrameView> view) |
| 129 { | 136 { |
| 130 // Oilpan: as RemoteFrameView performs no finalization actions, | 137 // Oilpan: as RemoteFrameView performs no finalization actions, |
| 131 // no explicit dispose() of it needed here. (cf. FrameView::dispose().) | 138 // no explicit dispose() of it needed here. (cf. FrameView::dispose().) |
| 132 m_view = view; | 139 m_view = view; |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 if (m_remotePlatformLayer) | 178 if (m_remotePlatformLayer) |
| 172 GraphicsLayer::registerContentsLayer(layer); | 179 GraphicsLayer::registerContentsLayer(layer); |
| 173 | 180 |
| 174 ASSERT(owner()); | 181 ASSERT(owner()); |
| 175 toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate(); | 182 toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate(); |
| 176 if (LayoutPart* layoutObject = ownerLayoutObject()) | 183 if (LayoutPart* layoutObject = ownerLayoutObject()) |
| 177 layoutObject->layer()->updateSelfPaintingLayer(); | 184 layoutObject->layer()->updateSelfPaintingLayer(); |
| 178 } | 185 } |
| 179 | 186 |
| 180 } // namespace blink | 187 } // namespace blink |
| OLD | NEW |