Have Frame::loader() return a reference

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 1622 matching lines @@
 }
 
 // WebWidget ------------------------------------------------------------------
 
 void WebViewImpl::close()
 {
     if (m_page) {
         // Initiate shutdown for the entire frameset.  This will cause a lot of
         // notifications to be sent.
         if (m_page->mainFrame())
-            m_page->mainFrame()->loader()->frameDetached();
+            m_page->mainFrame()->loader().frameDetached();
 
         m_page.clear();
     }
 
     // Should happen after m_page.clear().
     if (m_devToolsAgent)
         m_devToolsAgent.clear();
 
     // Helper Plugins must be closed now since doing so accesses RenderViewImpl,
     // which will be destroyed after this function returns.
@@ skipping 867 matching lines @@
 void WebViewImpl::setPageEncoding(const WebString& encodingName)
 {
     if (!m_page)
         return;
 
     // Only change override encoding, don't change default encoding.
     // Note that the new encoding must be 0 if it isn't supposed to be set.
     String newEncodingName;
     if (!encodingName.isEmpty())
         newEncodingName = encodingName;
-    m_page->mainFrame()->loader()->reload(NormalReload, KURL(), newEncodingName);
+    m_page->mainFrame()->loader().reload(NormalReload, KURL(), newEncodingName);
 }
 
 bool WebViewImpl::dispatchBeforeUnloadEvent()
 {
     // FIXME: This should really cause a recursive depth-first walk of all
     // frames in the tree, calling each frame's onbeforeunload.  At the moment,
     // we're consistent with Safari 3.1, not IE/FF.
     Frame* frame = m_page->mainFrame();
     if (!frame)
         return true;
 
-    return frame->loader()->shouldClose();
+    return frame->loader().shouldClose();
 }
 
 void WebViewImpl::dispatchUnloadEvent()
 {
     // Run unload handlers.
-    m_page->mainFrame()->loader()->closeURL();
+    m_page->mainFrame()->loader().closeURL();
 }
 
 WebFrame* WebViewImpl::mainFrame()
 {
     return mainFrameImpl();
 }
 
 WebFrame* WebViewImpl::findFrameByName(
     const WebString& name, WebFrame* relativeToFrame)
 {
@@ skipping 485 matching lines @@
     m_savedPageScaleFactor = 0;
     m_savedScrollOffset = IntSize();
 }
 
 void WebViewImpl::resetScrollAndScaleState()
 {
     page()->setPageScaleFactor(1, IntPoint());
 
     // Clear out the values for the current history item. This will prevent the history item from clobbering the
     // value determined during page scale initialization, which may be less than 1.
-    page()->mainFrame()->loader()->history()->saveDocumentAndScrollState();
-    page()->mainFrame()->loader()->history()->clearScrollPositionAndViewState();
+    page()->mainFrame()->loader().history()->saveDocumentAndScrollState();
+    page()->mainFrame()->loader().history()->clearScrollPositionAndViewState();
     m_pageScaleConstraintsSet.setNeedsReset(true);
 
     // Clobber saved scales and scroll offsets.
     if (FrameView* view = page()->mainFrame()->document()->view())
         view->cacheCurrentScrollPosition();
     resetSavedScrollAndScaleState();
 }
 
 void WebViewImpl::setFixedLayoutSize(const WebSize& layoutSize)
 {
@@ skipping 1049 matching lines @@
     const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefinedConstraints();
 
     if (!mainFrameImpl() || !mainFrameImpl()->frameView())
         return false;
 
     return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
         || (constraints.minimumScale == constraints.maximumScale && constraints.minimumScale != -1);
 }
 
 } // namespace WebKit