diff options
Diffstat (limited to 'WebCore/rendering/RenderBlockLineLayout.cpp')
| -rw-r--r-- | WebCore/rendering/RenderBlockLineLayout.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/WebCore/rendering/RenderBlockLineLayout.cpp b/WebCore/rendering/RenderBlockLineLayout.cpp index b6dc39f..127ffe0 100644 --- a/WebCore/rendering/RenderBlockLineLayout.cpp +++ b/WebCore/rendering/RenderBlockLineLayout.cpp @@ -641,7 +641,6 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica if (fullLayout || o->selfNeedsLayout()) dirtyLineBoxesForRenderer(o, fullLayout); o->setNeedsLayout(false); -<<<<<<< HEAD #ifdef ANDROID_LAYOUT if (doTextWrap && !hasTextToWrap && o->isText()) { Node* node = o->node(); @@ -662,10 +661,6 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica } } #endif - if (!o->isText()) - toRenderInline(o)->invalidateVerticalPosition(); // FIXME: Should do better here and not always invalidate everything. -======= ->>>>>>> webkit.org at r72274 } o = bidiNext(this, o, 0, false, &endOfInline); } |