diff options
| author | Steve Block <steveblock@google.com> | 2011-06-10 16:52:27 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-14 01:14:02 +0100 |
| commit | 54cdeeebc7adcbcd900e8b6a141a8cae27d9a631 (patch) | |
| tree | 845b0d338b204a48560eca3b51b34cf92ed96840 /Source/WebCore/rendering/RenderObject.h | |
| parent | d2c5226a647dc21d0c15267e09a3d19cf3e0d593 (diff) | |
| download | external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.zip external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.gz external_webkit-54cdeeebc7adcbcd900e8b6a141a8cae27d9a631.tar.bz2 | |
Merge WebKit at branches/chromium/742 r88085: Initial merge by git.
Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
Diffstat (limited to 'Source/WebCore/rendering/RenderObject.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderObject.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/rendering/RenderObject.h b/Source/WebCore/rendering/RenderObject.h index cf4d61b..14a40e9 100644 --- a/Source/WebCore/rendering/RenderObject.h +++ b/Source/WebCore/rendering/RenderObject.h @@ -1007,7 +1007,9 @@ inline void RenderObject::markContainingBlocksForLayout(bool scheduleRelayout, R if (!container && !o->isRenderView()) return; if (!last->isText() && (last->style()->position() == FixedPosition || last->style()->position() == AbsolutePosition)) { - if (o->m_posChildNeedsLayout) + while (o && !o->isRenderBlock()) // Skip relatively positioned inlines and get to the enclosing RenderBlock. + o = o->container(); + if (!o || o->m_posChildNeedsLayout) return; o->m_posChildNeedsLayout = true; simplifiedNormalFlowLayout = true; |