| 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 "web/WebRemoteFrameImpl.h" | 6 #include "web/WebRemoteFrameImpl.h" | 
| 7 | 7 | 
| 8 #include "core/frame/FrameView.h" | 8 #include "core/frame/FrameView.h" | 
| 9 #include "core/frame/RemoteFrame.h" | 9 #include "core/frame/RemoteFrame.h" | 
| 10 #include "core/frame/Settings.h" | 10 #include "core/frame/Settings.h" | 
| (...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 710 | 710 | 
| 711 WebString WebRemoteFrameImpl::layerTreeAsText(bool showDebugInfo) const | 711 WebString WebRemoteFrameImpl::layerTreeAsText(bool showDebugInfo) const | 
| 712 { | 712 { | 
| 713     ASSERT_NOT_REACHED(); | 713     ASSERT_NOT_REACHED(); | 
| 714     return WebString(); | 714     return WebString(); | 
| 715 } | 715 } | 
| 716 | 716 | 
| 717 WebLocalFrame* WebRemoteFrameImpl::createLocalChild(const WebString& name, WebSa
     ndboxFlags sandboxFlags, WebFrameClient* client) | 717 WebLocalFrame* WebRemoteFrameImpl::createLocalChild(const WebString& name, WebSa
     ndboxFlags sandboxFlags, WebFrameClient* client) | 
| 718 { | 718 { | 
| 719     WebLocalFrameImpl* child = toWebLocalFrameImpl(WebLocalFrame::create(client)
     ); | 719     WebLocalFrameImpl* child = toWebLocalFrameImpl(WebLocalFrame::create(client)
     ); | 
| 720     WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner> >::AddResult res
     ult = | 720     WillBeHeapHashMap<WebFrame*, OwnPtrWillBeMember<FrameOwner>>::AddResult resu
     lt = | 
| 721         m_ownersForChildren.add(child, RemoteBridgeFrameOwner::create(child, sta
     tic_cast<SandboxFlags>(sandboxFlags))); | 721         m_ownersForChildren.add(child, RemoteBridgeFrameOwner::create(child, sta
     tic_cast<SandboxFlags>(sandboxFlags))); | 
| 722     appendChild(child); | 722     appendChild(child); | 
| 723     // FIXME: currently this calls LocalFrame::init() on the created LocalFrame,
      which may | 723     // FIXME: currently this calls LocalFrame::init() on the created LocalFrame,
      which may | 
| 724     // result in the browser observing two navigations to about:blank (one from 
     the initial | 724     // result in the browser observing two navigations to about:blank (one from 
     the initial | 
| 725     // frame creation, and one from swapping it into the remote process). FrameL
     oader might | 725     // frame creation, and one from swapping it into the remote process). FrameL
     oader might | 
| 726     // need a special initialization function for this case to avoid that duplic
     ate navigation. | 726     // need a special initialization function for this case to avoid that duplic
     ate navigation. | 
| 727     child->initializeCoreFrame(frame()->host(), result.storedValue->value.get(),
      name, nullAtom); | 727     child->initializeCoreFrame(frame()->host(), result.storedValue->value.get(),
      name, nullAtom); | 
| 728     // Partially related with the above FIXME--the init() call may trigger JS di
     spatch. However, | 728     // Partially related with the above FIXME--the init() call may trigger JS di
     spatch. However, | 
| 729     // if the parent is remote, it should never be detached synchronously... | 729     // if the parent is remote, it should never be detached synchronously... | 
| 730     ASSERT(child->frame()); | 730     ASSERT(child->frame()); | 
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 802 { | 802 { | 
| 803     frame()->setIsLoading(false); | 803     frame()->setIsLoading(false); | 
| 804     if (parent() && parent()->isWebLocalFrame()) { | 804     if (parent() && parent()->isWebLocalFrame()) { | 
| 805         WebLocalFrameImpl* parentFrame = | 805         WebLocalFrameImpl* parentFrame = | 
| 806             toWebLocalFrameImpl(parent()->toWebLocalFrame()); | 806             toWebLocalFrameImpl(parent()->toWebLocalFrame()); | 
| 807         parentFrame->frame()->loader().checkCompleted(); | 807         parentFrame->frame()->loader().checkCompleted(); | 
| 808     } | 808     } | 
| 809 } | 809 } | 
| 810 | 810 | 
| 811 } // namespace blink | 811 } // namespace blink | 
| OLD | NEW | 
|---|