[REV] Reverted layout speed-ups until we find a way to make them work…

… with headers and footers

qt/src/3rdparty/webkit/Source/WebCore/dom/Document.cpp

@@ -2119,7 +2119,18 @@ void Document::implicitClose()
 
     frame()->loader()->checkCallImplicitClose();
     RenderObject* renderObject = renderer();
-
+
+    // We used to force a synchronous display and flush here.  This really isn't
+    // necessary and can in fact be actively harmful if pages are loading at a rate of > 60fps
+    // (if your platform is syncing flushes and limiting them to 60fps).
+    m_overMinimumLayoutThreshold = true;
+    if (!ownerElement() || (ownerElement()->renderer() && !ownerElement()->renderer()->needsLayout())) {
+        updateStyleIfNeeded();
+
+        // Always do a layout after loading if needed.
+        if (view() && renderObject && (!renderObject->firstChild() || renderObject->needsLayout()))
+            view()->layout();
+    }
 
 #if PLATFORM(MAC) || PLATFORM(CHROMIUM)
     if (f && renderObject && this == topDocument() && AXObjectCache::accessibilityEnabled()) {

qt/src/3rdparty/webkit/Source/WebCore/page/Frame.cpp

@@ -547,11 +547,16 @@ void Frame::setPrinting(bool printing, const FloatSize& pageSize, float maximumS
     m_doc->setPrinting(printing);
     view()->adjustMediaTypeForPrinting(printing);
 
-    if (not printing)
-        return;
-
     m_doc->styleSelectorChanged(RecalcStyleImmediately);
-    view()->forceLayoutForPagination(pageSize, maximumShrinkRatio, shouldAdjustViewSize);
+    if (printing)
+        view()->forceLayoutForPagination(pageSize, maximumShrinkRatio, shouldAdjustViewSize);
+    else {
+        view()->forceLayout();
+        if (shouldAdjustViewSize == AdjustViewSize)
+            view()->adjustViewSize();
+    }
+
+    // Subframes of the one we're printing don't lay out to the page size.
     for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling())
         child->setPrinting(printing, IntSize(), 0, shouldAdjustViewSize);
 }

qt/src/3rdparty/webkit/Source/WebCore/page/FrameView.cpp

@@ -816,7 +816,7 @@ void FrameView::layout(bool allowSubtree)
         m_size.setWidth(layoutWidth());
         return;
     }
-
+    
     // we shouldn't enter layout() while painting
     ASSERT(!isPainting());
     if (isPainting())
@@ -832,8 +832,6 @@ void FrameView::layout(bool allowSubtree)
     ASSERT(m_frame->view() == this);
 
     Document* document = m_frame->document();
-    if (!document->printing())
-        return;
 
     m_layoutSchedulingEnabled = false;