Plumbing blink::Interface{Provider|Registry} through WebLocalFrame's constructor.

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1413 matching lines @@
 WebString WebLocalFrameImpl::layerTreeAsText(bool showDebugInfo) const {
   if (!frame())
     return WebString();
 
   return WebString(frame()->layerTreeAsText(
       showDebugInfo ? LayerTreeIncludesDebugInfo : LayerTreeNormal));
 }
 
 // WebLocalFrameImpl public --------------------------------------------------
 
-WebLocalFrame* WebLocalFrame::create(WebTreeScopeType scope,
-                                     WebFrameClient* client,
-                                     WebFrame* opener) {
-  return WebLocalFrameImpl::create(scope, client, opener);
+WebLocalFrame* WebLocalFrame::create(
+    WebTreeScopeType scope,
+    WebFrameClient* client,
+    blink::InterfaceProvider* interfaceProvider,
+    blink::InterfaceRegistry* interfaceRegistry,
+    WebFrame* opener) {
+  return WebLocalFrameImpl::create(scope, client, interfaceProvider,
+                                   interfaceRegistry, opener);
 }
 
-WebLocalFrame* WebLocalFrame::createProvisional(WebFrameClient* client,
-                                                WebRemoteFrame* oldWebFrame,
-                                                WebSandboxFlags flags) {
-  return WebLocalFrameImpl::createProvisional(client, oldWebFrame, flags);
+WebLocalFrame* WebLocalFrame::createProvisional(
+    WebFrameClient* client,
+    blink::InterfaceProvider* interfaceProvider,
+    blink::InterfaceRegistry* interfaceRegistry,
+    WebRemoteFrame* oldWebFrame,
+    WebSandboxFlags flags) {
+  return WebLocalFrameImpl::createProvisional(
+      client, interfaceProvider, interfaceRegistry, oldWebFrame, flags);
 }
 
-WebLocalFrameImpl* WebLocalFrameImpl::create(WebTreeScopeType scope,
-                                             WebFrameClient* client,
-                                             WebFrame* opener) {
-  WebLocalFrameImpl* frame = new WebLocalFrameImpl(scope, client);
+WebLocalFrameImpl* WebLocalFrameImpl::create(
+    WebTreeScopeType scope,
+    WebFrameClient* client,
+    blink::InterfaceProvider* interfaceProvider,
+    blink::InterfaceRegistry* interfaceRegistry,
+    WebFrame* opener) {
+  WebLocalFrameImpl* frame = new WebLocalFrameImpl(
+      scope, client, interfaceProvider, interfaceRegistry);
   frame->setOpener(opener);
   return frame;
 }
 
 WebLocalFrameImpl* WebLocalFrameImpl::createProvisional(
     WebFrameClient* client,
+    blink::InterfaceProvider* interfaceProvider,
+    blink::InterfaceRegistry* interfaceRegistry,
     WebRemoteFrame* oldWebFrame,
     WebSandboxFlags flags) {
   DCHECK(client);
-  WebLocalFrameImpl* webFrame = new WebLocalFrameImpl(oldWebFrame, client);
+  WebLocalFrameImpl* webFrame = new WebLocalFrameImpl(
+      oldWebFrame, client, interfaceProvider, interfaceRegistry);
   Frame* oldFrame = oldWebFrame->toImplBase()->frame();
   webFrame->setParent(oldWebFrame->parent());
   webFrame->setOpener(oldWebFrame->opener());
   // Note: this *always* temporarily sets a frame owner, even for main frames!
   // When a core Frame is created with no owner, it attempts to set itself as
   // the main frame of the Page. However, this is a provisional frame, and may
   // disappear, so Page::m_mainFrame can't be updated just yet.
   FrameOwner* tempOwner = DummyFrameOwner::create();
   // TODO(dcheng): This block is very similar to initializeCoreFrame. Try to
   // reuse it here.
   LocalFrame* frame = LocalFrame::create(
       webFrame->m_frameLoaderClientImpl.get(), oldFrame->host(), tempOwner,
-      client->interfaceProvider(), client->interfaceRegistry());
+      interfaceProvider, interfaceRegistry);
   // Set the name and unique name directly, bypassing any of the normal logic
   // to calculate unique name.
   frame->tree().setPrecalculatedName(
       toWebRemoteFrameImpl(oldWebFrame)->frame()->tree().name(),
       toWebRemoteFrameImpl(oldWebFrame)->frame()->tree().uniqueName());
   webFrame->setCoreFrame(frame);
 
   frame->setOwner(oldFrame->owner());
 
   if (frame->owner() && frame->owner()->isRemote())
     toRemoteFrameOwner(frame->owner())
         ->setSandboxFlags(static_cast<SandboxFlags>(flags));
 
   // We must call init() after m_frame is assigned because it is referenced
   // during init(). Note that this may dispatch JS events; the frame may be
   // detached after init() returns.
   frame->init();
   return webFrame;
 }
 
-WebLocalFrameImpl::WebLocalFrameImpl(WebTreeScopeType scope,
-                                     WebFrameClient* client)
+WebLocalFrameImpl::WebLocalFrameImpl(
+    WebTreeScopeType scope,
+    WebFrameClient* client,
+    blink::InterfaceProvider* interfaceProvider,
+    blink::InterfaceRegistry* interfaceRegistry)
     : WebLocalFrame(scope),
       m_frameLoaderClientImpl(FrameLoaderClientImpl::create(this)),
       m_frameWidget(0),
       m_client(client),
       m_autofillClient(0),
       m_contentSettingsClient(0),
       m_inputEventsScaleFactorForEmulation(1),
+      m_interfaceProvider(interfaceProvider),
+      m_interfaceRegistry(interfaceRegistry),
       m_webDevToolsFrontend(0),
       m_inputMethodController(new WebInputMethodControllerImpl(this)),
       m_selfKeepAlive(this) {
   DCHECK(m_client);
   frameCount++;
 }
 
-WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame,
-                                     WebFrameClient* client)
+WebLocalFrameImpl::WebLocalFrameImpl(
+    WebRemoteFrame* oldWebFrame,
+    WebFrameClient* client,
+    blink::InterfaceProvider* interfaceProvider,
+    blink::InterfaceRegistry* interfaceRegistry)
     : WebLocalFrameImpl(oldWebFrame->inShadowTree()
                             ? WebTreeScopeType::Shadow
                             : WebTreeScopeType::Document,
-                        client) {}
+                        client,
+                        interfaceProvider,
+                        interfaceRegistry) {}
 
 WebLocalFrameImpl::~WebLocalFrameImpl() {
   // The widget for the frame, if any, must have already been closed.
   DCHECK(!m_frameWidget);
   frameCount--;
 }
 
 DEFINE_TRACE(WebLocalFrameImpl) {
   visitor->trace(m_frameLoaderClientImpl);
   visitor->trace(m_frame);
   visitor->trace(m_devToolsAgent);
   visitor->trace(m_textFinder);
   visitor->trace(m_printContext);
   visitor->trace(m_contextMenuNode);
   visitor->template registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>(
       this);
   WebFrame::traceFrames(visitor, this);
   WebFrameImplBase::trace(visitor);
 }
 
 void WebLocalFrameImpl::setCoreFrame(LocalFrame* frame) {
   m_frame = frame;
 }
 
 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host,
                                             FrameOwner* owner,
                                             const AtomicString& name,
                                             const AtomicString& uniqueName) {
-  setCoreFrame(
-      LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner,
-                         client() ? client()->interfaceProvider() : nullptr,
-                         client() ? client()->interfaceRegistry() : nullptr));
+  setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner,
+                                  m_interfaceProvider, m_interfaceRegistry));
   frame()->tree().setPrecalculatedName(name, uniqueName);
   // We must call init() after m_frame is assigned because it is referenced
   // during init(). Note that this may dispatch JS events; the frame may be
   // detached after init() returns.
   frame()->init();
   if (frame()) {
     if (frame()->loader().stateMachine()->isDisplayingInitialEmptyDocument() &&
         !parent() && !opener() &&
         frame()->settings()->getShouldReuseGlobalForUnownedMainFrame()) {
       frame()->document()->getSecurityOrigin()->grantUniversalAccess();
@@ skipping 794 matching lines @@
       ->frameScheduler()
       ->unthrottledTaskRunner()
       ->toSingleThreadTaskRunner();
 }
 
 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const {
   return m_inputMethodController.get();
 }
 
 }  // namespace blink