| Index: third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
|
| index 3a81125943c0778c94215d4fd75beebe0e903ec9..fdd5b4d3a4d28813678d76e422344252d734eb10 100644
|
| --- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
|
| @@ -263,7 +263,7 @@ bool LocalDOMWindow::allowPopUp(LocalFrame& firstFrame) {
|
| return true;
|
|
|
| Settings* settings = firstFrame.settings();
|
| - return settings && settings->javaScriptCanOpenWindowsAutomatically();
|
| + return settings && settings->GetJavaScriptCanOpenWindowsAutomatically();
|
| }
|
|
|
| bool LocalDOMWindow::allowPopUp() {
|
| @@ -862,7 +862,7 @@ int LocalDOMWindow::outerHeight() const {
|
| return 0;
|
|
|
| ChromeClient& chromeClient = host->chromeClient();
|
| - if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
|
| + if (host->settings().GetReportScreenSizeInPhysicalPixelsQuirk())
|
| return lroundf(chromeClient.rootWindowRect().height() *
|
| chromeClient.screenInfo().deviceScaleFactor);
|
| return chromeClient.rootWindowRect().height();
|
| @@ -877,7 +877,7 @@ int LocalDOMWindow::outerWidth() const {
|
| return 0;
|
|
|
| ChromeClient& chromeClient = host->chromeClient();
|
| - if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
|
| + if (host->settings().GetReportScreenSizeInPhysicalPixelsQuirk())
|
| return lroundf(chromeClient.rootWindowRect().width() *
|
| chromeClient.screenInfo().deviceScaleFactor);
|
|
|
| @@ -901,7 +901,7 @@ FloatSize LocalDOMWindow::getViewportSize(
|
| // initial page scale depends on the content width and is set after a
|
| // layout, perform one now so queries during page load will use the up to
|
| // date viewport.
|
| - if (host->settings().viewportEnabled() && frame()->isMainFrame())
|
| + if (host->settings().GetViewportEnabled() && frame()->isMainFrame())
|
| document()->updateStyleAndLayoutIgnorePendingStylesheets();
|
|
|
| // FIXME: This is potentially too much work. We really only need to know the
|
| @@ -913,7 +913,7 @@ FloatSize LocalDOMWindow::getViewportSize(
|
| ->updateStyleAndLayoutIgnorePendingStylesheets();
|
| }
|
|
|
| - return frame()->isMainFrame() && !host->settings().inertVisualViewport()
|
| + return frame()->isMainFrame() && !host->settings().GetInertVisualViewport()
|
| ? FloatSize(host->visualViewport().visibleRect().size())
|
| : FloatSize(view->visibleContentRect(scrollbarInclusion).size());
|
| }
|
| @@ -945,7 +945,7 @@ int LocalDOMWindow::screenX() const {
|
| return 0;
|
|
|
| ChromeClient& chromeClient = host->chromeClient();
|
| - if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
|
| + if (host->settings().GetReportScreenSizeInPhysicalPixelsQuirk())
|
| return lroundf(chromeClient.rootWindowRect().x() *
|
| chromeClient.screenInfo().deviceScaleFactor);
|
| return chromeClient.rootWindowRect().x();
|
| @@ -960,7 +960,7 @@ int LocalDOMWindow::screenY() const {
|
| return 0;
|
|
|
| ChromeClient& chromeClient = host->chromeClient();
|
| - if (host->settings().reportScreenSizeInPhysicalPixelsQuirk())
|
| + if (host->settings().GetReportScreenSizeInPhysicalPixelsQuirk())
|
| return lroundf(chromeClient.rootWindowRect().y() *
|
| chromeClient.screenInfo().deviceScaleFactor);
|
| return chromeClient.rootWindowRect().y();
|
| @@ -970,7 +970,7 @@ double LocalDOMWindow::scrollX() const {
|
| if (!frame() || !frame()->host())
|
| return 0;
|
|
|
| - if (!frame()->host()->settings().inertVisualViewport())
|
| + if (!frame()->host()->settings().GetInertVisualViewport())
|
| return m_visualViewport->pageX();
|
|
|
| FrameView* view = frame()->view();
|
| @@ -988,7 +988,7 @@ double LocalDOMWindow::scrollY() const {
|
| if (!frame() || !frame()->host())
|
| return 0;
|
|
|
| - if (!frame()->host()->settings().inertVisualViewport())
|
| + if (!frame()->host()->settings().GetInertVisualViewport())
|
| return m_visualViewport->pageY();
|
|
|
| FrameView* view = frame()->view();
|
| @@ -1120,7 +1120,7 @@ void LocalDOMWindow::scrollBy(double x,
|
| x = ScrollableArea::normalizeNonFiniteScroll(x);
|
| y = ScrollableArea::normalizeNonFiniteScroll(y);
|
|
|
| - ScrollableArea* viewport = host->settings().inertVisualViewport()
|
| + ScrollableArea* viewport = host->settings().GetInertVisualViewport()
|
| ? view->layoutViewportScrollableArea()
|
| : view->getScrollableArea();
|
|
|
| @@ -1167,7 +1167,7 @@ void LocalDOMWindow::scrollTo(double x, double y) const {
|
|
|
| ScrollOffset layoutOffset(x * frame()->pageZoomFactor(),
|
| y * frame()->pageZoomFactor());
|
| - ScrollableArea* viewport = host->settings().inertVisualViewport()
|
| + ScrollableArea* viewport = host->settings().GetInertVisualViewport()
|
| ? view->layoutViewportScrollableArea()
|
| : view->getScrollableArea();
|
| viewport->setScrollOffset(layoutOffset, ProgrammaticScroll,
|
| @@ -1196,7 +1196,7 @@ void LocalDOMWindow::scrollTo(const ScrollToOptions& scrollToOptions) const {
|
| double scaledX = 0.0;
|
| double scaledY = 0.0;
|
|
|
| - ScrollableArea* viewport = host->settings().inertVisualViewport()
|
| + ScrollableArea* viewport = host->settings().GetInertVisualViewport()
|
| ? view->layoutViewportScrollableArea()
|
| : view->getScrollableArea();
|
|
|
|
|