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

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2589143003: Add 'get' prefix for Settings.in generated code. (Closed)
Patch Set: Only get prefix and no capitalization. Created 3 years, 11 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
Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index e330262b19fb0eb8426a68b995ee40a55ccb690f..7d064994811f9bdcc894363549fda2ad15364ac8 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -549,9 +549,10 @@ void FrameLoader::didBeginDocument() {
Settings* settings = m_frame->document()->settings();
if (settings) {
- m_frame->document()->fetcher()->setImagesEnabled(settings->imagesEnabled());
+ m_frame->document()->fetcher()->setImagesEnabled(
+ settings->getImagesEnabled());
m_frame->document()->fetcher()->setAutoLoadImages(
- settings->loadsImagesAutomatically());
+ settings->getLoadsImagesAutomatically());
}
if (m_documentLoader) {
@@ -782,7 +783,8 @@ bool FrameLoader::allowPlugins(ReasonForCallingAllowPlugins reason) {
if (!client())
return false;
Settings* settings = m_frame->settings();
- bool allowed = client()->allowPlugins(settings && settings->pluginsEnabled());
+ bool allowed =
+ client()->allowPlugins(settings && settings->getPluginsEnabled());
if (!allowed && reason == AboutToInstantiatePlugin)
client()->didNotAllowPlugins();
return allowed;
@@ -813,7 +815,7 @@ void FrameLoader::updateForSameDocumentNavigation(
HistoryCommitType historyCommitType = loadTypeToCommitType(type);
if (!m_currentItem)
historyCommitType = HistoryInertCommit;
- if (m_frame->settings()->historyEntryRequiresUserGesture() &&
+ if (m_frame->settings()->getHistoryEntryRequiresUserGesture() &&
initiatingDocument && !initiatingDocument->hasReceivedUserGesture()) {
historyCommitType = HistoryInertCommit;
}
@@ -958,7 +960,7 @@ FrameLoadType FrameLoader::determineFrameLoadType(
m_loadType == FrameLoadTypeReload)
return FrameLoadTypeReload;
- if (m_frame->settings()->historyEntryRequiresUserGesture() &&
+ if (m_frame->settings()->getHistoryEntryRequiresUserGesture() &&
request.originDocument() &&
!request.originDocument()->hasReceivedUserGesture())
return FrameLoadTypeReplaceCurrentItem;
@@ -1751,7 +1753,7 @@ void FrameLoader::dispatchDidClearDocumentOfWindowObject() {
return;
Settings* settings = m_frame->settings();
- if (settings && settings->forceMainWorldInitialization())
+ if (settings && settings->getForceMainWorldInitialization())
m_frame->script().initializeMainWorld();
InspectorInstrumentation::didClearDocumentOfWindowObject(m_frame);
« no previous file with comments | « third_party/WebKit/Source/core/loader/FrameFetchContext.cpp ('k') | third_party/WebKit/Source/core/loader/ImageLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698