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

Unified Diff: Source/core/html/HTMLOptionElement.cpp

Issue 415343003: Option Groups with display: none should not show the children option elements (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed assert failure in linux dbg build Created 6 years, 4 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/core/html/HTMLOptionElement.h ('k') | Source/core/html/HTMLSelectElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLOptionElement.cpp
diff --git a/Source/core/html/HTMLOptionElement.cpp b/Source/core/html/HTMLOptionElement.cpp
index a02a889367e73b3afbc50809de3ccd44a1c21b21..53b5f2ab5a1f87711126797807b97449bfcaad22 100644
--- a/Source/core/html/HTMLOptionElement.cpp
+++ b/Source/core/html/HTMLOptionElement.cpp
@@ -397,4 +397,22 @@ bool HTMLOptionElement::spatialNavigationFocused() const
return select->spatialNavigationFocusedOption() == this;
}
+bool HTMLOptionElement::isDisplayNone() const
+{
+ // If m_style is not set, then the node is still unattached.
+ // We have to wait till it gets attached to read the display property.
+ if (!m_style)
+ return false;
+
+ if (m_style->display() != NONE) {
+ Element* parent = parentElement();
+ ASSERT(parent);
+ if (isHTMLOptGroupElement(*parent)) {
+ RenderStyle* parentStyle = parent->renderStyle() ? parent->renderStyle() : parent->computedStyle();
+ return !parentStyle || parentStyle->display() == NONE;
+ }
+ }
+ return m_style->display() == NONE;
+}
+
} // namespace blink
« no previous file with comments | « Source/core/html/HTMLOptionElement.h ('k') | Source/core/html/HTMLSelectElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698