| 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" |
| 11 #include "core/frame/RemoteDOMWindow.h" | 11 #include "core/frame/RemoteDOMWindow.h" |
| 12 #include "core/frame/RemoteFrameClient.h" | 12 #include "core/frame/RemoteFrameClient.h" |
| 13 #include "core/frame/RemoteFrameView.h" | 13 #include "core/frame/RemoteFrameView.h" |
| 14 #include "core/html/HTMLFrameOwnerElement.h" | 14 #include "core/html/HTMLFrameOwnerElement.h" |
| 15 #include "core/layout/Layer.h" | 15 #include "core/layout/Layer.h" |
| 16 #include "core/rendering/RenderPart.h" | 16 #include "core/layout/LayoutPart.h" |
| 17 #include "platform/graphics/GraphicsLayer.h" | 17 #include "platform/graphics/GraphicsLayer.h" |
| 18 #include "platform/weborigin/SecurityPolicy.h" | 18 #include "platform/weborigin/SecurityPolicy.h" |
| 19 #include "public/platform/WebLayer.h" | 19 #include "public/platform/WebLayer.h" |
| 20 | 20 |
| 21 namespace blink { | 21 namespace blink { |
| 22 | 22 |
| 23 inline RemoteFrame::RemoteFrame(RemoteFrameClient* client, FrameHost* host, Fram
eOwner* owner) | 23 inline RemoteFrame::RemoteFrame(RemoteFrameClient* client, FrameHost* host, Fram
eOwner* owner) |
| 24 : Frame(client, host, owner) | 24 : Frame(client, host, owner) |
| 25 , m_securityContext(RemoteSecurityContext::create()) | 25 , m_securityContext(RemoteSecurityContext::create()) |
| 26 , m_domWindow(RemoteDOMWindow::create(*this)) | 26 , m_domWindow(RemoteDOMWindow::create(*this)) |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 void RemoteFrame::setRemotePlatformLayer(WebLayer* layer) | 144 void RemoteFrame::setRemotePlatformLayer(WebLayer* layer) |
| 145 { | 145 { |
| 146 if (m_remotePlatformLayer) | 146 if (m_remotePlatformLayer) |
| 147 GraphicsLayer::unregisterContentsLayer(m_remotePlatformLayer); | 147 GraphicsLayer::unregisterContentsLayer(m_remotePlatformLayer); |
| 148 m_remotePlatformLayer = layer; | 148 m_remotePlatformLayer = layer; |
| 149 if (m_remotePlatformLayer) | 149 if (m_remotePlatformLayer) |
| 150 GraphicsLayer::registerContentsLayer(layer); | 150 GraphicsLayer::registerContentsLayer(layer); |
| 151 | 151 |
| 152 ASSERT(owner()); | 152 ASSERT(owner()); |
| 153 toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate(); | 153 toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate(); |
| 154 if (RenderPart* renderer = ownerRenderer()) | 154 if (LayoutPart* renderer = ownerRenderer()) |
| 155 renderer->layer()->updateSelfPaintingLayer(); | 155 renderer->layer()->updateSelfPaintingLayer(); |
| 156 } | 156 } |
| 157 | 157 |
| 158 } // namespace blink | 158 } // namespace blink |
| OLD | NEW |