OSDN Git Service

Cherry-pick security fix in WebKit change 63772
authorSteve Block <steveblock@google.com>
Thu, 9 Sep 2010 10:20:02 +0000 (11:20 +0100)
committerSteve Block <steveblock@google.com>
Thu, 9 Sep 2010 11:19:31 +0000 (12:19 +0100)
commit440c0366ae0192fb737c7dd87dc2d7156266b3f7
tree0e525f410c041b955dc43191604cfa2b24a70956
parentbe2b5a3fe0063db46087ef38f78a1e2aa7b47631
Cherry-pick security fix in WebKit change 63772

See http://trac.webkit.org/changeset/63772

Note that this is only a partial cherry-pick. I don't think that the
fix to RenderBlock::canMergeContiguousAnonymousBlocks() is required as
we don't have this method in our version of WebKit. The method was
added in http://trac.webkit.org/changeset/60201). Attempting to make
the fix without this change, or cherry-picking this change too, would
be too high risk.

Bug: 2986936
Change-Id: I8d9f1924611e693e340dcb2f05a43d5673ef23b1
WebCore/rendering/RenderObjectChildList.cpp