From 1db5234dc6f4ead5068048189126d02f46da6557 Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Tue, 21 Jun 2011 14:24:32 -0700 Subject: Remove old customized code. This fixes slashdot.org after recent webkit merge, since the removed code will sometimes require extra layout. This code is two years old, and related to iframe flattening, which is not used any more in Android. Android still does frameset flattening. Verified sites such as developer.android.com are still working. issue: 4753055 Change-Id: I69f78bec53671eb488b629bde7cc2c3158f1a510 --- Source/WebCore/rendering/RenderBlock.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'Source/WebCore') diff --git a/Source/WebCore/rendering/RenderBlock.cpp b/Source/WebCore/rendering/RenderBlock.cpp index 22d3b3c..792b809 100644 --- a/Source/WebCore/rendering/RenderBlock.cpp +++ b/Source/WebCore/rendering/RenderBlock.cpp @@ -2161,13 +2161,6 @@ bool RenderBlock::simplifiedLayout() updateScrollInfoAfterLayout(); -#ifdef ANDROID_FIX - // iframe flatten will call FrameView::layout() which calls performPostLayoutTasks, - // which may make us need to layout again - if (!posChildNeedsLayout() || normalChildNeedsLayout() || selfNeedsLayout()) - return false; -#endif - setNeedsLayout(false); return true; } -- cgit v1.1