diff options
| author | Steve Block <steveblock@google.com> | 2012-04-10 14:45:04 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-04-10 15:22:45 +0100 |
| commit | c9773ed4ca308bb2b8e70f49ba7fbaa35b1f46a2 (patch) | |
| tree | 7fa81b6376295abaaf33bc1f4bb6c898f6b0971c /Source/WebCore/rendering/RenderReplaced.h | |
| parent | 27ecdfb1b551244c4c15289fa375f07bee2f95da (diff) | |
| download | external_webkit-c9773ed4ca308bb2b8e70f49ba7fbaa35b1f46a2.zip external_webkit-c9773ed4ca308bb2b8e70f49ba7fbaa35b1f46a2.tar.gz external_webkit-c9773ed4ca308bb2b8e70f49ba7fbaa35b1f46a2.tar.bz2 | |
Cherry-pick WebKit change r90068 to fix a rendering crash
Note that this change does not apply cleanly in RenderBlock::destroy() without
r85869.
r85869 was intended to be an optimization only, with no functional change.
However, it introduced two crashes, one of which is fixed in r90068 and the
other in r86060. To avoid the need to cherry-pick both r85869 and r86060 as
prerequisites, the patch for r90068 was applied manually to give the correct
end result in RenderBlock::destroy().
We now pass the LayoutTests added in r90068 and the LayoutTest added in r86060
does not crash.
See http://trac.webkit.org/changeset/90068
Bug: 5496903
Change-Id: Ica6dc2c70a4cd5c781ae77df95a8a4033c097708
Diffstat (limited to 'Source/WebCore/rendering/RenderReplaced.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderReplaced.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderReplaced.h b/Source/WebCore/rendering/RenderReplaced.h index d6ebba6..29fc71c 100644 --- a/Source/WebCore/rendering/RenderReplaced.h +++ b/Source/WebCore/rendering/RenderReplaced.h @@ -32,6 +32,8 @@ public: RenderReplaced(Node*, const IntSize& intrinsicSize); virtual ~RenderReplaced(); + virtual void destroy(); + protected: virtual void layout(); |