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

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

Issue 2589143003: Add 'get' prefix for Settings.in generated code. (Closed)
Patch Set: Capitalize the prefix. Created 4 years 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 89d17d0fdff2ca14029fae3e3222fa8fd30545d0..7642f5e2768f7665a6d22b164182459dc2aa23af 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -545,9 +545,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) {
@@ -783,7 +784,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;
@@ -814,7 +816,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;
}
@@ -959,7 +961,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;
@@ -1817,7 +1819,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);

Powered by Google App Engine
This is Rietveld 408576698