| 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 e3c6e83a079b087481dbfc59f9e235e0f2f0aa05..b5f394368ebc7133d4bd738f9c208a8ec399adfe 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -186,7 +186,7 @@ FrameView::FrameView(LocalFrame& frame)
|
| m_didScrollTimer(TaskRunnerHelper::get(TaskType::UnspecedTimer, &frame),
|
| this,
|
| &FrameView::didScrollTimerFired),
|
| - m_needsUpdateWidgetGeometries(false),
|
| + m_needsUpdateGeometries(false),
|
| m_horizontalScrollbarMode(ScrollbarAuto),
|
| m_verticalScrollbarMode(ScrollbarAuto),
|
| m_horizontalScrollbarLock(false),
|
| @@ -1463,7 +1463,7 @@ void FrameView::removePart(LayoutPart* object) {
|
| m_parts.erase(object);
|
| }
|
|
|
| -void FrameView::updateWidgetGeometries() {
|
| +void FrameView::updateGeometries() {
|
| Vector<RefPtr<LayoutPart>> parts;
|
| copyToVector(m_parts, parts);
|
|
|
| @@ -1477,11 +1477,11 @@ void FrameView::updateWidgetGeometries() {
|
| if (frameViewBase->isFrameView()) {
|
| FrameView* frameView = toFrameView(frameViewBase);
|
| bool didNeedLayout = frameView->needsLayout();
|
| - part->updateWidgetGeometry();
|
| + part->updateGeometry();
|
| if (!didNeedLayout && !frameView->shouldThrottleRendering())
|
| frameView->checkDoesNotNeedLayout();
|
| } else {
|
| - part->updateWidgetGeometry();
|
| + part->updateGeometry();
|
| }
|
| }
|
| }
|
| @@ -2002,7 +2002,7 @@ void FrameView::updateLayersAndCompositingAfterScrollIfNeeded() {
|
| // change. Update FrameViewBase and layer positions after scrolling, but only
|
| // if we're not inside of layout.
|
| if (!m_nestedLayoutCount) {
|
| - updateWidgetGeometries();
|
| + updateGeometries();
|
| LayoutViewItem layoutViewItem = this->layoutViewItem();
|
| if (!layoutViewItem.isNull())
|
| layoutViewItem.layer()->setNeedsCompositingInputsUpdate();
|
| @@ -2439,7 +2439,7 @@ bool FrameView::updateWidgets() {
|
|
|
| if (element->needsWidgetUpdate())
|
| element->updateWidget();
|
| - object.updateWidgetGeometry();
|
| + object.updateGeometry();
|
|
|
| // Prevent plugins from causing infinite updates of themselves.
|
| // FIXME: Do we really need to prevent this?
|
| @@ -2498,9 +2498,9 @@ void FrameView::performPostLayoutTasks() {
|
| // scheduling is moved from EventHandler to PageEventHandler.
|
| frame().localFrameRoot()->eventHandler().scheduleCursorUpdate();
|
|
|
| - updateWidgetGeometries();
|
| + updateGeometries();
|
|
|
| - // Plugins could have torn down the page inside updateWidgetGeometries().
|
| + // Plugins could have torn down the page inside updateGeometries().
|
| if (layoutViewItem().isNull())
|
| return;
|
|
|
| @@ -2856,13 +2856,13 @@ void FrameView::visualViewportScrollbarsChanged() {
|
| }
|
| }
|
|
|
| -void FrameView::updateWidgetGeometriesIfNeeded() {
|
| - if (!m_needsUpdateWidgetGeometries)
|
| +void FrameView::updateGeometriesIfNeeded() {
|
| + if (!m_needsUpdateGeometries)
|
| return;
|
|
|
| - m_needsUpdateWidgetGeometries = false;
|
| + m_needsUpdateGeometries = false;
|
|
|
| - updateWidgetGeometries();
|
| + updateGeometries();
|
| }
|
|
|
| GeometryMapper& FrameView::geometryMapper() {
|
| @@ -3335,7 +3335,7 @@ void FrameView::updateStyleAndLayoutIfNeededRecursiveInternal() {
|
| m_frame->document()->layoutView()->assertLaidOut();
|
| #endif
|
|
|
| - updateWidgetGeometriesIfNeeded();
|
| + updateGeometriesIfNeeded();
|
|
|
| if (lifecycle().state() < DocumentLifecycle::LayoutClean)
|
| lifecycle().advanceTo(DocumentLifecycle::LayoutClean);
|
|
|