Skip to content

Commit

Permalink
Cherry-pick WebKit security fix (webkit.org r68860) Do not merge
Browse files Browse the repository at this point in the history
See http://trac.webkit.org/changeset/68860

Change-Id: I7860374528be836e1f4ea7c6faa48966fd3ed23c
  • Loading branch information
Ben Murdoch committed Oct 21, 2010
1 parent 93bec1e commit a7b8ec7
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion WebCore/rendering/RenderObjectChildList.cpp
Expand Up @@ -429,7 +429,10 @@ void RenderObjectChildList::updateBeforeAfterContent(RenderObject* owner, Pseudo
generatedContentContainer->setStyle(pseudoElementStyle);
owner->addChild(generatedContentContainer, insertBefore);
}
generatedContentContainer->addChild(renderer);
if (generatedContentContainer->isChildAllowed(renderer, pseudoElementStyle))
generatedContentContainer->addChild(renderer);
else
renderer->destroy();
}
}
}
Expand Down

0 comments on commit a7b8ec7

Please sign in to comment.