| 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 70dea6b62cb0a40ce685023b571b17b194d213e8..7e6574a15d0c2f0123652ef84db5848ac3d1e84b 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -611,7 +611,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;
|
| }
|
|
|
| @@ -828,7 +829,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;
|
| }
|
| @@ -952,7 +953,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 &&
|
| @@ -1466,8 +1467,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;
|
| }
|
|
|
| @@ -2471,7 +2472,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();
|
| @@ -2621,7 +2622,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 {
|
| @@ -2726,7 +2727,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.
|
| @@ -3572,7 +3573,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;
|
|
|
| @@ -3724,7 +3725,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(
|
| @@ -3841,7 +3842,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;
|
| @@ -3994,7 +3995,7 @@ bool FrameView::needsScrollbarReconstruction() const {
|
| }
|
|
|
| bool FrameView::shouldIgnoreOverflowHidden() const {
|
| - return m_frame->settings()->ignoreMainFrameOverflowHiddenQuirk() &&
|
| + return m_frame->settings()->GetIgnoreMainFrameOverflowHiddenQuirk() &&
|
| m_frame->isMainFrame();
|
| }
|
|
|
| @@ -4743,7 +4744,7 @@ void FrameView::updateSubFrameScrollOnMainReason(
|
| MainThreadScrollingReasons parentReason) {
|
| MainThreadScrollingReasons reasons = parentReason;
|
|
|
| - if (!page()->settings().threadedScrollingEnabled())
|
| + if (!page()->settings().GetThreadedScrollingEnabled())
|
| reasons |= MainThreadScrollingReason::kThreadedScrollingDisabled;
|
|
|
| if (!frame.isLocalFrame())
|
| @@ -4807,7 +4808,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())
|
|
|