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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.h

Issue 2783543004: Move registration of LocalFrame mojo interfaces to ModulesInitializer. (Closed)
Patch Set: Move modules initialization to the first operation in LocalFrame::Init as the loader can actually d… Created 3 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999-2001 Lars Knoll <knoll@kde.org> 3 * 1999-2001 Lars Knoll <knoll@kde.org>
4 * 1999-2001 Antti Koivisto <koivisto@kde.org> 4 * 1999-2001 Antti Koivisto <koivisto@kde.org>
5 * 2000-2001 Simon Hausmann <hausmann@kde.org> 5 * 2000-2001 Simon Hausmann <hausmann@kde.org>
6 * 2000-2001 Dirk Mueller <mueller@kde.org> 6 * 2000-2001 Dirk Mueller <mueller@kde.org>
7 * 2000 Stefan Schimanski <1Stein@gmx.de> 7 * 2000 Stefan Schimanski <1Stein@gmx.de>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
9 * reserved. 9 * reserved.
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 218
219 InterfaceProvider* interfaceProvider() { return m_interfaceProvider; } 219 InterfaceProvider* interfaceProvider() { return m_interfaceProvider; }
220 InterfaceRegistry* interfaceRegistry() { return m_interfaceRegistry; } 220 InterfaceRegistry* interfaceRegistry() { return m_interfaceRegistry; }
221 221
222 LocalFrameClient* client() const; 222 LocalFrameClient* client() const;
223 223
224 PluginData* pluginData() const; 224 PluginData* pluginData() const;
225 225
226 PerformanceMonitor* performanceMonitor() { return m_performanceMonitor; } 226 PerformanceMonitor* performanceMonitor() { return m_performanceMonitor; }
227 227
228 using FrameInitCallback = void (*)(LocalFrame*);
229 // Allows for the registration of a callback that is invoked whenever a new
230 // LocalFrame is initialized. Callbacks are executed in the order that they
231 // were added using registerInitializationCallback, and there are no checks
232 // for adding a callback multiple times.
233 static void registerInitializationCallback(FrameInitCallback);
234
228 private: 235 private:
229 friend class FrameNavigationDisabler; 236 friend class FrameNavigationDisabler;
230 237
231 LocalFrame(LocalFrameClient*, 238 LocalFrame(LocalFrameClient*,
232 Page&, 239 Page&,
233 FrameOwner*, 240 FrameOwner*,
234 InterfaceProvider*, 241 InterfaceProvider*,
235 InterfaceRegistry*); 242 InterfaceRegistry*);
236 243
237 // Intentionally private to prevent redundant checks when the type is 244 // Intentionally private to prevent redundant checks when the type is
(...skipping 30 matching lines...) Expand all
268 275
269 bool m_inViewSourceMode; 276 bool m_inViewSourceMode;
270 277
271 Member<CoreProbeSink> m_instrumentingAgents; 278 Member<CoreProbeSink> m_instrumentingAgents;
272 Member<PerformanceMonitor> m_performanceMonitor; 279 Member<PerformanceMonitor> m_performanceMonitor;
273 280
274 InterfaceProvider* const m_interfaceProvider; 281 InterfaceProvider* const m_interfaceProvider;
275 InterfaceRegistry* const m_interfaceRegistry; 282 InterfaceRegistry* const m_interfaceRegistry;
276 }; 283 };
277 284
278 inline void LocalFrame::init() {
279 m_loader.init();
280 }
281
282 inline FrameLoader& LocalFrame::loader() const { 285 inline FrameLoader& LocalFrame::loader() const {
283 return m_loader; 286 return m_loader;
284 } 287 }
285 288
286 inline NavigationScheduler& LocalFrame::navigationScheduler() const { 289 inline NavigationScheduler& LocalFrame::navigationScheduler() const {
287 ASSERT(m_navigationScheduler); 290 ASSERT(m_navigationScheduler);
288 return *m_navigationScheduler.get(); 291 return *m_navigationScheduler.get();
289 } 292 }
290 293
291 inline FrameView* LocalFrame::view() const { 294 inline FrameView* LocalFrame::view() const {
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 explicit ScopedFrameBlamer(LocalFrame*); 374 explicit ScopedFrameBlamer(LocalFrame*);
372 ~ScopedFrameBlamer(); 375 ~ScopedFrameBlamer();
373 376
374 private: 377 private:
375 Member<LocalFrame> m_frame; 378 Member<LocalFrame> m_frame;
376 }; 379 };
377 380
378 } // namespace blink 381 } // namespace blink
379 382
380 #endif // LocalFrame_h 383 #endif // LocalFrame_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698