Clarify the size of a document view (a.k.a layout size) that causes FrameView to emit the resize ev…

Source/core/page/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 1003 matching lines @@
             // Now set our scrollbar state for the layout.
             ScrollbarMode currentHMode = horizontalScrollbarMode();
             ScrollbarMode currentVMode = verticalScrollbarMode();
 
             if (m_firstLayout || (hMode != currentHMode || vMode != currentVMode)) {
                 if (m_firstLayout) {
                     setScrollbarsSuppressed(true);
 
                     m_firstLayout = false;
                     m_firstLayoutCallbackPending = true;
-                    m_lastViewportSize = visibleContentRect(IncludeScrollbars).size();
+                    m_lastViewportSize = layoutSizeIncludingScrollbars();

[kenneth.r.christiansen, 2013/05/06 19:50:51]

The layout size doesn't include scrollbars. That sounds weird.

It is actually the visible rect including scrollbars right?

OK, it doesn't seem like you introduced this method, so ignore my comment

                     m_lastZoomFactor = root->style()->zoom();
 
                     // Set the initial vMode to AlwaysOn if we're auto.
                     if (vMode == ScrollbarAuto)
                         setVerticalScrollbarMode(ScrollbarAlwaysOn); // This causes a vertical scrollbar to appear.
                     // Set the initial hMode to AlwaysOff if we're auto.
                     if (hMode == ScrollbarAuto)
                         setHorizontalScrollbarMode(ScrollbarAlwaysOff); // This causes a horizontal scrollbar to disappear.
 
                     setScrollbarModes(hMode, vMode);
@@ skipping 1272 matching lines @@
     }
 
     scrollToAnchor();
 
     m_actionScheduler->resume();
 
     // Refetch render view since it can be destroyed by updateWidget()
     // call above.
     renderView = this->renderView();
     if (renderView && !renderView->printing()) {
-        IntSize currentSize;
-        currentSize = visibleContentRect(IncludeScrollbars).size();
+        IntSize currentSize = layoutSizeIncludingScrollbars();
         float currentZoomFactor = renderView->style()->zoom();
         bool resized = !m_firstLayout && (currentSize != m_lastViewportSize || currentZoomFactor != m_lastZoomFactor);
         m_lastViewportSize = currentSize;
         m_lastZoomFactor = currentZoomFactor;
         if (resized) {
             m_frame->eventHandler()->sendResizeEvent();
             if (page && page->mainFrame() == m_frame)
                 InspectorInstrumentation::didResizeMainFrame(page);
         }
     }
@@ skipping 1145 matching lines @@
 }
 
 AXObjectCache* FrameView::axObjectCache() const
 {
     if (frame() && frame()->document())
         return frame()->document()->existingAXObjectCache();
     return 0;
 }
     
 } // namespace WebCore