Move registration of LocalFrame mojo interfaces to ModulesInitializer.

third_party/WebKit/Source/core/frame/LocalFrame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
@@ skipping 237 matching lines @@
   return toLocalFrame(parent)->pageZoomFactor();
 }
 
 inline float parentTextZoomFactor(LocalFrame* frame) {
   Frame* parent = frame->tree().parent();
   if (!parent || !parent->isLocalFrame())
     return 1;
   return toLocalFrame(parent)->textZoomFactor();
 }
 
+std::vector<LocalFrame::FrameInitCallback>& getInitializationVector() {
+  DEFINE_THREAD_SAFE_STATIC_LOCAL(
+      std::vector<LocalFrame::FrameInitCallback>, initializationVector,

[haraken, 2017/03/29 08:10:24]

Use WTF::Vector. Blink doesn't use std::vector.

Also LocalFrame is not accessible from non-main threads. You can use
DEFINE_STATIC_LOCAL.

[slangley, 2017/03/29 23:09:38]

Done

+      new std::vector<LocalFrame::FrameInitCallback>());
+  return initializationVector;
+}
+
 }  // namespace
 
 template class CORE_TEMPLATE_EXPORT Supplement<LocalFrame>;
 
 LocalFrame* LocalFrame::create(LocalFrameClient* client,
                                Page& page,
                                FrameOwner* owner,
                                InterfaceProvider* interfaceProvider,
                                InterfaceRegistry* interfaceRegistry) {
   LocalFrame* frame = new LocalFrame(
       client, page, owner,
       interfaceProvider ? interfaceProvider
                         : InterfaceProvider::getEmptyInterfaceProvider(),
       interfaceRegistry ? interfaceRegistry
                         : InterfaceRegistry::getEmptyInterfaceRegistry());
   probe::frameAttachedToParent(frame);
   return frame;
 }
 
+void LocalFrame::init() {
+  m_loader.init();
+
+  for (auto& initilizationCallback : getInitializationVector()) {
+    initilizationCallback(this);
+  }
+}
+
 void LocalFrame::setView(FrameView* view) {
   ASSERT(!m_view || m_view != view);
   ASSERT(!document() || !document()->isActive());
 
   eventHandler().clear();
 
   m_view = view;
 }
 
 void LocalFrame::createView(const IntSize& viewportSize,
@@ skipping 550 matching lines @@
     }
   }
 
   return layers ? layers->toPrettyJSONString() : String();
 }
 
 bool LocalFrame::shouldThrottleRendering() const {
   return view() && view()->shouldThrottleRendering();
 }
 
+void LocalFrame::registerInitializationCallback(FrameInitCallback cb) {
+  getInitializationVector().push_back(cb);

[haraken, 2017/03/29 08:10:24]

cb => callback

Blink prefers a fully qualified name.

[slangley, 2017/03/29 23:09:38]

Done

+}
+
 inline LocalFrame::LocalFrame(LocalFrameClient* client,
                               Page& page,
                               FrameOwner* owner,
                               InterfaceProvider* interfaceProvider,
                               InterfaceRegistry* interfaceRegistry)
     : Frame(client, page, owner, LocalWindowProxyManager::create(*this)),
       m_frameScheduler(page.chromeClient().createFrameScheduler(
           client->frameBlameContext())),
       m_loader(this),
       m_navigationScheduler(NavigationScheduler::create(this)),
@@ skipping 57 matching lines @@
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Enter();
 }
 
 ScopedFrameBlamer::~ScopedFrameBlamer() {
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Leave();
 }
 
 }  // namespace blink