diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-06-21 14:24:32 -0700 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2011-06-21 14:24:32 -0700 |
| commit | 1db5234dc6f4ead5068048189126d02f46da6557 (patch) | |
| tree | 1182b470e450ae25ce294367e756ef0b7b0565ad /Source/WebCore | |
| parent | 0a04cffc0086c1a1282618121dd63fcbce5fcc51 (diff) | |
| download | external_webkit-1db5234dc6f4ead5068048189126d02f46da6557.zip external_webkit-1db5234dc6f4ead5068048189126d02f46da6557.tar.gz external_webkit-1db5234dc6f4ead5068048189126d02f46da6557.tar.bz2 | |
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
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/rendering/RenderBlock.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
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; } |