Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Side by Side Diff: third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp

Issue 1830883002: Add blink::ServiceRegistry and expose it from LocalFrame and Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "web/WebRemoteFrameImpl.h" 5 #include "web/WebRemoteFrameImpl.h"
6 6
7 #include "core/frame/FrameView.h" 7 #include "core/frame/FrameView.h"
8 #include "core/frame/Settings.h" 8 #include "core/frame/Settings.h"
9 #include "core/html/HTMLFrameOwnerElement.h" 9 #include "core/html/HTMLFrameOwnerElement.h"
10 #include "core/layout/LayoutObject.h" 10 #include "core/layout/LayoutObject.h"
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 ASSERT_NOT_REACHED(); 588 ASSERT_NOT_REACHED();
589 return false; 589 return false;
590 } 590 }
591 591
592 WebString WebRemoteFrameImpl::layerTreeAsText(bool showDebugInfo) const 592 WebString WebRemoteFrameImpl::layerTreeAsText(bool showDebugInfo) const
593 { 593 {
594 ASSERT_NOT_REACHED(); 594 ASSERT_NOT_REACHED();
595 return WebString(); 595 return WebString();
596 } 596 }
597 597
598 WebLocalFrame* WebRemoteFrameImpl::createLocalChild(WebTreeScopeType scope, cons t WebString& name, const WebString& uniqueName, WebSandboxFlags sandboxFlags, We bFrameClient* client, WebFrame* previousSibling, const WebFrameOwnerProperties& frameOwnerProperties, WebFrame* opener) 598 WebLocalFrame* WebRemoteFrameImpl::createLocalChild(WebTreeScopeType scope, cons t WebString& name, const WebString& uniqueName, WebSandboxFlags sandboxFlags, We bFrameClient* client, WebFrame* previousSibling, const WebFrameOwnerProperties& frameOwnerProperties, WebFrame* opener, ServiceRegistry* serviceRegistry)
599 { 599 {
600 WebLocalFrameImpl* child = WebLocalFrameImpl::create(scope, client, opener); 600 WebLocalFrameImpl* child = WebLocalFrameImpl::create(scope, client, opener, serviceRegistry);
601 insertAfter(child, previousSibling); 601 insertAfter(child, previousSibling);
602 RefPtrWillBeRawPtr<RemoteFrameOwner> owner = RemoteFrameOwner::create(static _cast<SandboxFlags>(sandboxFlags), frameOwnerProperties); 602 RefPtrWillBeRawPtr<RemoteFrameOwner> owner = RemoteFrameOwner::create(static _cast<SandboxFlags>(sandboxFlags), frameOwnerProperties);
603 // FIXME: currently this calls LocalFrame::init() on the created LocalFrame, which may 603 // FIXME: currently this calls LocalFrame::init() on the created LocalFrame, which may
604 // result in the browser observing two navigations to about:blank (one from the initial 604 // result in the browser observing two navigations to about:blank (one from the initial
605 // frame creation, and one from swapping it into the remote process). FrameL oader might 605 // frame creation, and one from swapping it into the remote process). FrameL oader might
606 // need a special initialization function for this case to avoid that duplic ate navigation. 606 // need a special initialization function for this case to avoid that duplic ate navigation.
607 child->initializeCoreFrame(frame()->host(), owner.get(), name, uniqueName); 607 child->initializeCoreFrame(frame()->host(), owner.get(), name, uniqueName);
608 // Partially related with the above FIXME--the init() call may trigger JS di spatch. However, 608 // Partially related with the above FIXME--the init() call may trigger JS di spatch. However,
609 // if the parent is remote, it should never be detached synchronously... 609 // if the parent is remote, it should never be detached synchronously...
610 ASSERT(child->frame()); 610 ASSERT(child->frame());
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 : WebRemoteFrame(scope) 728 : WebRemoteFrame(scope)
729 , m_frameClient(RemoteFrameClientImpl::create(this)) 729 , m_frameClient(RemoteFrameClientImpl::create(this))
730 , m_client(client) 730 , m_client(client)
731 #if ENABLE(OILPAN) 731 #if ENABLE(OILPAN)
732 , m_selfKeepAlive(this) 732 , m_selfKeepAlive(this)
733 #endif 733 #endif
734 { 734 {
735 } 735 }
736 736
737 } // namespace blink 737 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698