diff options
| author | Grace Kloba <> | 2009-03-24 20:17:36 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-24 20:17:36 -0700 |
| commit | c4e3b3281a821e60834e2bdb4e3358986dda5b91 (patch) | |
| tree | 0abf0ac97ec6617d90471c3690cc2fdf60f53aad /WebCore | |
| parent | 94f46216cd816730cc0f802492b7673a7cdf05e0 (diff) | |
| download | external_webkit-c4e3b3281a821e60834e2bdb4e3358986dda5b91.zip external_webkit-c4e3b3281a821e60834e2bdb4e3358986dda5b91.tar.gz external_webkit-c4e3b3281a821e60834e2bdb4e3358986dda5b91.tar.bz2 | |
Automated import from //branches/master/...@141440,141440
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/rendering/RenderBlock.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp index 6d18ba1..0d73961 100644 --- a/WebCore/rendering/RenderBlock.cpp +++ b/WebCore/rendering/RenderBlock.cpp @@ -1400,6 +1400,13 @@ bool RenderBlock::layoutOnlyPositionedObjects() if (hasOverflowClip()) m_layer->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; } |