diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-19 09:57:40 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 1dc835977a4eb41ef79490200c176352bae43cc1 (patch) | |
| tree | 5fb80efa49b8492d1d4d3f4b1eae329c085626ee /WebCore/rendering/RenderBlockLineLayout.cpp | |
| parent | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (diff) | |
| download | external_webkit-1dc835977a4eb41ef79490200c176352bae43cc1.zip external_webkit-1dc835977a4eb41ef79490200c176352bae43cc1.tar.gz external_webkit-1dc835977a4eb41ef79490200c176352bae43cc1.tar.bz2 | |
Merge WebKit at r72272: Fix conflicts.
WebCore/Android.v8bindings.mk
http://trac.webkit.org/changeset/71802
WebCore/bindings/v8/V8Proxy.cpp
http://trac.webkit.org/changeset/71735
WebCore/css/CSSParser.cpp
http://trac.webkit.org/changeset/71767
http://trac.webkit.org/changeset/72116 (several APIs purged)
WebCore/loader/ResourceLoader.cpp
http://trac.webkit.org/changeset/71884
WebCore/platform/graphics/MediaPlayer.cpp
http://trac.webkit.org/changeset/72117
WebCore/platform/image-decoders/ImageDecoder.cpp
http://trac.webkit.org/changeset/72130
WebCore/rendering/RenderBlockLineLayout.cpp
http://trac.webkit.org/changeset/72235
WebCore/rendering/RenderView.cpp
http://trac.webkit.org/changeset/71851
Change-Id: If0a3466754b9755c1f4be97bf589f88c48eece0a
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); } |