diff options
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/RenderBlockLineLayout.cpp | 5 | ||||
| -rw-r--r-- | WebCore/rendering/RenderView.cpp | 21 |
2 files changed, 9 insertions, 17 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); } diff --git a/WebCore/rendering/RenderView.cpp b/WebCore/rendering/RenderView.cpp index 2885f15..8672ff4 100644 --- a/WebCore/rendering/RenderView.cpp +++ b/WebCore/rendering/RenderView.cpp @@ -321,17 +321,6 @@ void RenderView::computeRectForRepaint(RenderBoxModelObject* repaintContainer, I if (printing()) return; -<<<<<<< HEAD -#ifdef ANDROID_FIXED_ELEMENTS -#if ENABLE(COMPOSITED_FIXED_ELEMENTS) - const Settings * settings = document()->settings(); - if (settings && (settings->viewportWidth() == -1 || settings->viewportWidth() == 0) && - !settings->viewportUserScalable()) -#else - if (false) -#endif -#endif -======= if (style()->isFlippedBlocksWritingMode()) { // We have to flip by hand since the view's logical height has not been determined. We // can use the viewport width and height. @@ -341,7 +330,15 @@ void RenderView::computeRectForRepaint(RenderBoxModelObject* repaintContainer, I rect.setX(viewWidth() - rect.right()); } ->>>>>>> webkit.org at r72274 +#ifdef ANDROID_FIXED_ELEMENTS +#if ENABLE(COMPOSITED_FIXED_ELEMENTS) + const Settings * settings = document()->settings(); + if (settings && (settings->viewportWidth() == -1 || settings->viewportWidth() == 0) && + !settings->viewportUserScalable()) +#else + if (false) +#endif +#endif if (fixed && m_frameView) rect.move(m_frameView->scrollX(), m_frameView->scrollY()); |