diff options
| author | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2013-12-20 13:59:43 +0530 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-09 15:05:54 +0200 |
| commit | 5267ff3c462986f514f33998a2614b8f9c22402e (patch) | |
| tree | 862db954fd02864ba2cee41fdfba8a0829ddb244 /src | |
| parent | 8304869598812ec5204f4f2a103c73dd97640e25 (diff) | |
| download | qt4-tools-5267ff3c462986f514f33998a2614b8f9c22402e.tar.gz | |
Restore dirty line logic in RenderInline::destroy
In ea0cb7ad2066d9c3dc695ab2ebe724249b05ca0f the webkit version was
upgraded which effectively merged http://trac.webkit.org/changeset/85869
The follow up patch was never merged: http://trac.webkit.org/changeset/86060
associated with ​https://bugs.webkit.org/show_bug.cgi?id=60448
Change-Id: I7dff1733439bb3bcfecc767da9147aa09a3159cf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/Source/WebCore/rendering/RenderInline.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderInline.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderInline.cpp index 5bd726dbda..49f0224692 100644 --- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderInline.cpp +++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderInline.cpp @@ -99,7 +99,8 @@ void RenderInline::destroy() for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) box->remove(); } - } + } else if (parent()) + parent()->dirtyLinesFromChangedChild(this); } m_lineBoxes.deleteLineBoxes(renderArena()); |