Revert "Remove extraneous frameView->setNeedsLayout() in LayoutPart"

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 149 matching lines @@
     , m_verticalScrollbarLock(false)
     , m_scrollbarsAvoidingResizer(0)
     , m_scrollbarsSuppressed(false)
     , m_inUpdateScrollbars(false)
     , m_frameTimingRequestsDirty(true)
     , m_viewportIntersectionValid(false)
     , m_hiddenForThrottling(false)
     , m_crossOriginForThrottling(false)
     , m_subtreeThrottled(false)
     , m_currentUpdateLifecyclePhasesTargetState(DocumentLifecycle::Uninitialized)
+    , m_needsScrollbarsUpdate(false)
     , m_suppressAdjustViewSize(false)
     , m_allowsLayoutInvalidationAfterLayoutClean(true)
 {
     ASSERT(m_frame);
     init();
 }
 
 FrameView* FrameView::create(LocalFrame* frame)
 {
     FrameView* view = new FrameView(frame);
@@ skipping 205 matching lines @@
     layoutItem.invalidatePaintRectangle(LayoutRect(paintInvalidationRect));
 }
 
 void FrameView::setFrameRect(const IntRect& newRect)
 {
     IntRect oldRect = frameRect();
     if (newRect == oldRect)
         return;
 
     Widget::setFrameRect(newRect);
-    frameRectsChanged();
 
-    if (oldRect.size() == newRect.size())
-        return;
+    const bool frameSizeChanged = oldRect.size() != newRect.size();
 
+    m_needsScrollbarsUpdate = frameSizeChanged;
     // TODO(wjmaclean): find out why scrollbars fail to resize for complex
     // subframes after changing the zoom level. For now always calling
     // updateScrollbarsIfNeeded() here fixes the issue, but it would be good to
     // discover the deeper cause of this. http://crbug.com/607987.
-    updateScrollbars();
+    updateScrollbarsIfNeeded();
+
+    frameRectsChanged();
 
     updateScrollableAreaSet();
 
     if (LayoutViewItem layoutView = this->layoutViewItem()) {
+        // TODO(majidvp): It seems that this only needs to be called when size
+        // is updated ignoring any change in the location.
         if (layoutView.usesCompositing())
             layoutView.compositor()->frameViewDidChangeSize();
     }
 
-    viewportSizeChanged(newRect.width() != oldRect.width(), newRect.height() != oldRect.height());
+    if (frameSizeChanged) {
+        viewportSizeChanged(newRect.width() != oldRect.width(), newRect.height() != oldRect.height());
 
-    if (m_frame->isMainFrame())
-        m_frame->host()->visualViewport().mainFrameDidChangeSize();
-    frame().loader().restoreScrollPositionAndViewState();
+        if (m_frame->isMainFrame())
+            m_frame->host()->visualViewport().mainFrameDidChangeSize();
+        frame().loader().restoreScrollPositionAndViewState();
+    }
 }
 
 Page* FrameView::page() const
 {
     return frame().page();
 }
 
 LayoutView* FrameView::layoutView() const
 {
     return frame().contentLayoutObject();
@@ skipping 3155 matching lines @@
     return hasAnyScrollbar && (shouldUseCustom != hasCustom);
 }
 
 bool FrameView::shouldIgnoreOverflowHidden() const
 {
     return m_frame->settings()->ignoreMainFrameOverflowHiddenQuirk() && m_frame->isMainFrame();
 }
 
 void FrameView::updateScrollbarsIfNeeded()
 {
-    if (needsScrollbarReconstruction() || scrollOriginChanged())
+    if (m_needsScrollbarsUpdate || needsScrollbarReconstruction() || scrollOriginChanged())
         updateScrollbars();
 }
 
 void FrameView::updateScrollbars()
 {
+    m_needsScrollbarsUpdate = false;
+
     if (m_frame->settings() && m_frame->settings()->rootLayerScrolls())
         return;
 
     // Avoid drawing two sets of scrollbars when visual viewport is enabled.
     if (visualViewportSuppliesScrollbars()) {
         setHasHorizontalScrollbar(false);
         setHasVerticalScrollbar(false);
         adjustScrollPositionFromUpdateScrollbars();
         return;
     }
@@ skipping 650 matching lines @@
 }
 
 bool FrameView::canThrottleRendering() const
 {
     if (!RuntimeEnabledFeatures::renderingPipelineThrottlingEnabled())
         return false;
     return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrottling);
 }
 
 } // namespace blink