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

Unified Diff: third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp

Issue 2450093005: Support display: contents for elements, first-line and first-letter pseudos. (Closed)
Patch Set: Allow text as child of the LayoutView, since it can happen with display: contents Created 4 years 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
Index: third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp b/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
index d0bf597f41a5725b68521c02ba9abef9fdea39da..4fecd657f3c87fb9fea71c92642b86a4f9369fa3 100644
--- a/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLOptGroupElement.cpp
@@ -68,19 +68,6 @@ void HTMLOptGroupElement::parseAttribute(const QualifiedName& name,
}
}
-void HTMLOptGroupElement::attachLayoutTree(const AttachContext& context) {
- if (context.resolvedStyle) {
- DCHECK(!m_style || m_style == context.resolvedStyle);
- m_style = context.resolvedStyle;
- }
- HTMLElement::attachLayoutTree(context);
-}
-
-void HTMLOptGroupElement::detachLayoutTree(const AttachContext& context) {
- m_style.clear();
- HTMLElement::detachLayoutTree(context);
-}
-
bool HTMLOptGroupElement::supportsFocus() const {
HTMLSelectElement* select = ownerSelectElement();
if (select && select->usesMenuList())
@@ -110,23 +97,13 @@ void HTMLOptGroupElement::removedFrom(ContainerNode* insertionPoint) {
HTMLElement::removedFrom(insertionPoint);
}
-void HTMLOptGroupElement::updateNonComputedStyle() {
- m_style = originalStyleForLayoutObject();
- if (layoutObject()) {
+void HTMLOptGroupElement::willRecalcStyle(StyleRecalcChange change) {
+ if (layoutObject() && (change >= IndependentInherit || needsStyleRecalc())) {
if (HTMLSelectElement* select = ownerSelectElement())
select->updateListOnLayoutObject();
}
}
-ComputedStyle* HTMLOptGroupElement::nonLayoutObjectComputedStyle() const {
- return m_style.get();
-}
-
-PassRefPtr<ComputedStyle> HTMLOptGroupElement::customStyleForLayoutObject() {
- updateNonComputedStyle();
- return m_style;
-}
-
String HTMLOptGroupElement::groupLabelText() const {
String itemText = getAttribute(labelAttr);

Powered by Google App Engine
This is Rietveld 408576698