Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Unified Diff: Source/WebCore/html/HTMLSelectElement.cpp

Issue 10694124: Merge 122082 - Heap-use-after-free in WebCore::RenderObject::destroyAndCleanupAnonymousWrappers (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/html/HTMLFormControlElement.cpp ('k') | Source/WebCore/html/ValidationMessage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/html/HTMLSelectElement.cpp
===================================================================
--- Source/WebCore/html/HTMLSelectElement.cpp (revision 122284)
+++ Source/WebCore/html/HTMLSelectElement.cpp (working copy)
@@ -346,7 +346,11 @@
bool HTMLSelectElement::childShouldCreateRenderer(const NodeRenderingContext& childContext) const
{
- return childContext.isOnUpperEncapsulationBoundary() && HTMLFormControlElementWithState::childShouldCreateRenderer(childContext);
+ if (!HTMLFormControlElementWithState::childShouldCreateRenderer(childContext))
+ return false;
+ if (!usesMenuList())
+ return true;
+ return validationMessageShadowTreeContains(childContext.node());
}
HTMLOptionsCollection* HTMLSelectElement::options()
« no previous file with comments | « Source/WebCore/html/HTMLFormControlElement.cpp ('k') | Source/WebCore/html/ValidationMessage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698