2 files changed, 15 insertions, 5 deletions
diff --git a/Source/WebCore/rendering/RenderFrame.cpp b/Source/WebCore/rendering/RenderFrame.cpp
index 4b1444b..0ae6eda 100644
--- a/Source/WebCore/rendering/RenderFrame.cpp
+++ b/Source/WebCore/rendering/RenderFrame.cpp
@@ -64,7 +64,12 @@ void RenderFrame::layout()
 {
     FrameView* view = static_cast<FrameView*>(widget());
     RenderView* root = view ? view->frame()->contentRenderer() : 0;
+
+    // Do not expand frames which has zero width or height
     if (!width() || !height() || !root) {
+        updateWidgetPosition();
+        if (view)
+            view->layout();
         setNeedsLayout(false);
         return;
     }
@@ -75,14 +80,17 @@ void RenderFrame::layout()
         return;
     }
 
-    int layoutWidth = width();
+    // Update the dimensions to get the correct width and height
+    updateWidgetPosition();
+    if (root->preferredLogicalWidthsDirty())
+        root->computePreferredLogicalWidths();
 
+    // Expand the frame by setting frame height = content height
     setWidth(max(view->contentsWidth() + borderAndPaddingWidth(), width()));
     setHeight(max(view->contentsHeight() + borderAndPaddingHeight(), height()));
 
-    // Trigger a layout of the FrameView which will schedule a relayout of this RenderFrame.
-    if (layoutWidth < width())
-        view->layout();
+    // Update one more time
+    updateWidgetPosition();
 
     setNeedsLayout(false);
 }
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
index 733a418..1871b57 100644
--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
@@ -628,6 +628,7 @@ bool RenderLayerCompositor::checkForPositionedElements(Vector<RenderLayer*>* lis
     bool fixedSibling = false;
     bool positionedSibling = false;
 
+#if 0
     // For absolute positioned elements, we need to check if they are followed
     // by a composited element; if so, they also need to be composited, as the
     // layer display rendering might be incorrect (absolute elements being
@@ -650,6 +651,7 @@ bool RenderLayerCompositor::checkForPositionedElements(Vector<RenderLayer*>* lis
             break;
         }
     }
+#endif
 
     // If we find a fixed layer, let's mark all the following layers as being
     // composited. The layers' surfaces will be merged if needed UI-side.
@@ -737,7 +739,7 @@ void RenderLayerCompositor::computeCompositingRequirements(RenderLayer* layer, O
 
     bool willBeComposited = needsToBeComposited(layer);
 
-#if ENABLE(COMPOSITED_FIXED_ELEMENTS)
+#if 0 && ENABLE(COMPOSITED_FIXED_ELEMENTS)
     willBeComposited |= layer->shouldComposite();
     layer->setMustOverlapCompositedLayers(layer->shouldComposite());
 #endif