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

Unified Diff: Source/core/page/Page.cpp

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/page/EventHandler.cpp ('k') | Source/core/page/PageGroupLoadDeferrer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/Page.cpp
diff --git a/Source/core/page/Page.cpp b/Source/core/page/Page.cpp
index 5aa6b17c0b9b7bd4f2b6573503d92e34a70465b6..309ef28849621733372d3c8f3913db5d6fef53ad 100644
--- a/Source/core/page/Page.cpp
+++ b/Source/core/page/Page.cpp
@@ -280,10 +280,10 @@ void Page::goToItem(HistoryItem* item)
// being deref()-ed. Make sure we can still use it with HistoryController::goToItem later.
RefPtr<HistoryItem> protector(item);
- if (m_mainFrame->loader()->history()->shouldStopLoadingForHistoryItem(item))
- m_mainFrame->loader()->stopAllLoaders();
+ if (m_mainFrame->loader().history()->shouldStopLoadingForHistoryItem(item))
+ m_mainFrame->loader().stopAllLoaders();
- m_mainFrame->loader()->history()->goToItem(item);
+ m_mainFrame->loader().history()->goToItem(item);
}
void Page::clearPageGroup()
@@ -350,18 +350,18 @@ void Page::refreshPlugins(bool reload)
continue;
for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree().traverseNext()) {
- if (frame->loader()->containsPlugins())
+ if (frame->loader().containsPlugins())
framesNeedingReload.append(frame);
}
}
for (size_t i = 0; i < framesNeedingReload.size(); ++i)
- framesNeedingReload[i]->loader()->reload();
+ framesNeedingReload[i]->loader().reload();
}
PluginData* Page::pluginData() const
{
- if (!mainFrame()->loader()->allowPlugins(NotAboutToInstantiatePlugin))
+ if (!mainFrame()->loader().allowPlugins(NotAboutToInstantiatePlugin))
return 0;
if (!m_pluginData)
m_pluginData = PluginData::create(this);
@@ -394,7 +394,7 @@ void Page::setDefersLoading(bool defers)
m_defersLoading = defers;
for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
- frame->loader()->setDefersLoading(defers);
+ frame->loader().setDefersLoading(defers);
}
void Page::setPageScaleFactor(float scale, const IntPoint& origin)
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/PageGroupLoadDeferrer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698