Revert 148647 "Remove frame flattening support as Chromium has n..."

trunk/Source/core/rendering/TextAutosizer.cpp

Index: trunk/Source/core/rendering/TextAutosizer.cpp
===================================================================
--- trunk/Source/core/rendering/TextAutosizer.cpp	(revision 148648)
+++ trunk/Source/core/rendering/TextAutosizer.cpp	(working copy)
@@ -120,8 +120,10 @@
     // Largest area of block that can be visible at once (assuming the main
     // frame doesn't get scaled to less than overview scale), in CSS pixels.
     windowInfo.minLayoutSize = mainFrame->view()->layoutSize();
-    for (Frame* frame = m_document->frame(); frame; frame = frame->tree()->parent())
-        windowInfo.minLayoutSize = windowInfo.minLayoutSize.shrunkTo(frame->view()->layoutSize());
+    for (Frame* frame = m_document->frame(); frame; frame = frame->tree()->parent()) {
+        if (!frame->view()->isInChildFrameWithFrameFlattening())
+            windowInfo.minLayoutSize = windowInfo.minLayoutSize.shrunkTo(frame->view()->layoutSize());
+    }
 
     // The layoutRoot could be neither a container nor a cluster, so walk up the tree till we find each of these.
     RenderBlock* container = layoutRoot->isRenderBlock() ? toRenderBlock(layoutRoot) : layoutRoot->containingBlock();