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

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.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/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 7befa59cab9596c4259b88f2b9181b14a778f3c7..8c608403d1f74396a4b35aeee60cddc50c6c426d 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -618,7 +618,8 @@ bool FrameView::shouldUseCustomScrollbars(
customScrollbarFrame = nullptr;
if (Settings* settings = m_frame->settings()) {
- if (!settings->allowCustomScrollbarInMainFrame() && m_frame->isMainFrame())
+ if (!settings->getAllowCustomScrollbarInMainFrame() &&
+ m_frame->isMainFrame())
return false;
}
@@ -831,7 +832,7 @@ bool FrameView::usesCompositedScrolling() const {
if (layoutView.isNull())
return false;
if (m_frame->settings() &&
- m_frame->settings()->preferCompositingToLCDTextEnabled())
+ m_frame->settings()->getPreferCompositingToLCDTextEnabled())
return layoutView.compositor()->inCompositingMode();
return false;
}
@@ -955,7 +956,7 @@ void FrameView::performPreLayoutTasks() {
// completely different style information.
bool mainFrameRotation =
m_frame->isMainFrame() && m_frame->settings() &&
- m_frame->settings()->mainFrameResizesAreOrientationChanges();
+ m_frame->settings()->getMainFrameResizesAreOrientationChanges();
if ((wasResized &&
document->styleEngine().mediaQueryAffectedByViewportChange()) ||
(wasResized && mainFrameRotation &&
@@ -1480,8 +1481,8 @@ void FrameView::setMediaType(const AtomicString& mediaType) {
AtomicString FrameView::mediaType() const {
// See if we have an override type.
if (m_frame->settings() &&
- !m_frame->settings()->mediaTypeOverride().isEmpty())
- return AtomicString(m_frame->settings()->mediaTypeOverride());
+ !m_frame->settings()->getMediaTypeOverride().isEmpty())
+ return AtomicString(m_frame->settings()->getMediaTypeOverride());
return m_mediaType;
}
@@ -2498,7 +2499,7 @@ void FrameView::updateCounters() {
bool FrameView::shouldUseIntegerScrollOffset() const {
if (m_frame->settings() &&
- !m_frame->settings()->preferCompositingToLCDTextEnabled())
+ !m_frame->settings()->getPreferCompositingToLCDTextEnabled())
return true;
return ScrollableArea::shouldUseIntegerScrollOffset();
@@ -2648,7 +2649,7 @@ void FrameView::notifyPageThatContentAreaWillPaint() const {
}
bool FrameView::scrollAnimatorEnabled() const {
- return m_frame->settings() && m_frame->settings()->scrollAnimatorEnabled();
+ return m_frame->settings() && m_frame->settings()->getScrollAnimatorEnabled();
}
void FrameView::updateDocumentAnnotatedRegions() const {
@@ -2753,7 +2754,7 @@ FrameView* FrameView::parentFrameView() const {
}
void FrameView::didChangeGlobalRootScroller() {
- if (!m_frame->settings() || !m_frame->settings()->viewportEnabled())
+ if (!m_frame->settings() || !m_frame->settings()->getViewportEnabled())
return;
// Avoid drawing two sets of scrollbars when visual viewport is enabled.
@@ -3599,7 +3600,7 @@ void FrameView::removeChild(Widget* child) {
bool FrameView::visualViewportSuppliesScrollbars() {
// On desktop, we always use the layout viewport's scrollbars.
- if (!m_frame->settings() || !m_frame->settings()->viewportEnabled() ||
+ if (!m_frame->settings() || !m_frame->settings()->getViewportEnabled() ||
!m_frame->document() || !m_frame->host())
return false;
@@ -3751,7 +3752,7 @@ IntSize FrameView::contentsSize() const {
void FrameView::clipPaintRect(FloatRect* paintRect) const {
// Paint the whole rect if "mainFrameClipsContent" is false, meaning that
// WebPreferences::record_whole_document is true.
- if (!m_frame->settings()->mainFrameClipsContent())
+ if (!m_frame->settings()->getMainFrameClipsContent())
return;
paintRect->intersect(
@@ -3868,7 +3869,7 @@ void FrameView::computeScrollbarExistence(
bool& newHasVerticalScrollbar,
const IntSize& docSize,
ComputeScrollbarExistenceOption option) {
- if ((m_frame->settings() && m_frame->settings()->hideScrollbars()) ||
+ if ((m_frame->settings() && m_frame->settings()->getHideScrollbars()) ||
visualViewportSuppliesScrollbars()) {
newHasHorizontalScrollbar = false;
newHasVerticalScrollbar = false;
@@ -4021,7 +4022,7 @@ bool FrameView::needsScrollbarReconstruction() const {
}
bool FrameView::shouldIgnoreOverflowHidden() const {
- return m_frame->settings()->ignoreMainFrameOverflowHiddenQuirk() &&
+ return m_frame->settings()->getIgnoreMainFrameOverflowHiddenQuirk() &&
m_frame->isMainFrame();
}
@@ -4776,7 +4777,7 @@ void FrameView::updateSubFrameScrollOnMainReason(
MainThreadScrollingReasons parentReason) {
MainThreadScrollingReasons reasons = parentReason;
- if (!page()->settings().threadedScrollingEnabled())
+ if (!page()->settings().getThreadedScrollingEnabled())
reasons |= MainThreadScrollingReason::kThreadedScrollingDisabled;
if (!frame.isLocalFrame())
@@ -4843,7 +4844,7 @@ MainThreadScrollingReasons FrameView::mainThreadScrollingReasons() const {
MainThreadScrollingReasons reasons =
static_cast<MainThreadScrollingReasons>(0);
- if (!page()->settings().threadedScrollingEnabled())
+ if (!page()->settings().getThreadedScrollingEnabled())
reasons |= MainThreadScrollingReason::kThreadedScrollingDisabled;
if (!page()->mainFrame()->isLocalFrame())
« no previous file with comments | « third_party/WebKit/Source/core/frame/DOMWindow.cpp ('k') | third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698