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

Unified Diff: Source/core/frame/Frame.h

Issue 31063004: Have Frame::loader() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/DOMWindow.cpp ('k') | Source/core/frame/Frame.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/Frame.h
diff --git a/Source/core/frame/Frame.h b/Source/core/frame/Frame.h
index c13ff1d76426fbd4c84cf48f2650627422303820..0937f95e287c1a3e1e88a4f141d197eb050f750e 100644
--- a/Source/core/frame/Frame.h
+++ b/Source/core/frame/Frame.h
@@ -97,13 +97,13 @@ namespace WebCore {
Editor& editor() const;
EventHandler& eventHandler() const;
- FrameLoader* loader() const;
+ FrameLoader& loader() const;
NavigationScheduler& navigationScheduler() const;
FrameSelection& selection() const;
FrameTree& tree() const;
AnimationController& animation() const;
InputMethodController& inputMethodController() const;
- FetchContext& fetchContext() const { return loader()->fetchContext(); }
+ FetchContext& fetchContext() const { return loader().fetchContext(); }
ScriptController& script();
SpellChecker& spellChecker() const;
@@ -202,9 +202,9 @@ namespace WebCore {
m_loader.init();
}
- inline FrameLoader* Frame::loader() const
+ inline FrameLoader& Frame::loader() const
{
- return &m_loader;
+ return m_loader;
}
inline NavigationScheduler& Frame::navigationScheduler() const
« no previous file with comments | « Source/core/frame/DOMWindow.cpp ('k') | Source/core/frame/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698