diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-06-21 17:53:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-21 17:53:08 -0700 |
| commit | 0aeb39e78cd408ab6a60c25bc5dd25c4894cd262 (patch) | |
| tree | 840fb6daac1ad1d4ae4ab6b40409df5bf9265fce /Source/WebCore | |
| parent | f46157c6d35b0fbc5eeb73f44a5553057d219013 (diff) | |
| parent | 1db5234dc6f4ead5068048189126d02f46da6557 (diff) | |
| download | external_webkit-0aeb39e78cd408ab6a60c25bc5dd25c4894cd262.zip external_webkit-0aeb39e78cd408ab6a60c25bc5dd25c4894cd262.tar.gz external_webkit-0aeb39e78cd408ab6a60c25bc5dd25c4894cd262.tar.bz2 | |
Merge "Remove old customized code."
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; } |