| Index: third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
|
| index 99b43be45600ada8a5cd9662f2c8a86530ec3d2e..b54a18f2f66880109e749b733e0ee42a36d435a0 100644
|
| --- a/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp
|
| @@ -610,7 +610,7 @@ WebString WebRemoteFrameImpl::layerTreeAsText(bool showDebugInfo) const
|
| WebLocalFrame* WebRemoteFrameImpl::createLocalChild(WebTreeScopeType scope, const WebString& name, WebSandboxFlags sandboxFlags, WebFrameClient* client, WebFrame* previousSibling, const WebFrameOwnerProperties& frameOwnerProperties)
|
| {
|
| WebLocalFrameImpl* child = toWebLocalFrameImpl(WebLocalFrame::create(scope, client));
|
| - WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner>>::AddResult result =
|
| + HeapHashMap<WebFrame*, Member<FrameOwner>>::AddResult result =
|
| m_ownersForChildren.add(child, RemoteBridgeFrameOwner::create(child, static_cast<SandboxFlags>(sandboxFlags), frameOwnerProperties));
|
| insertAfter(child, previousSibling);
|
| // FIXME: currently this calls LocalFrame::init() on the created LocalFrame, which may
|
| @@ -635,14 +635,14 @@ void WebRemoteFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner,
|
| WebRemoteFrame* WebRemoteFrameImpl::createRemoteChild(WebTreeScopeType scope, const WebString& name, WebSandboxFlags sandboxFlags, WebRemoteFrameClient* client)
|
| {
|
| WebRemoteFrameImpl* child = toWebRemoteFrameImpl(WebRemoteFrame::create(scope, client));
|
| - WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner>>::AddResult result =
|
| + HeapHashMap<WebFrame*, Member<FrameOwner>>::AddResult result =
|
| m_ownersForChildren.add(child, RemoteBridgeFrameOwner::create(nullptr, static_cast<SandboxFlags>(sandboxFlags), WebFrameOwnerProperties()));
|
| appendChild(child);
|
| child->initializeCoreFrame(frame()->host(), result.storedValue->value.get(), name, nullAtom);
|
| return child;
|
| }
|
|
|
| -void WebRemoteFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<RemoteFrame> frame)
|
| +void WebRemoteFrameImpl::setCoreFrame(RawPtr<RemoteFrame> frame)
|
| {
|
| m_frame = frame;
|
| }
|
|
|