Index: third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp |
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp b/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp |
index 74dda2f08ca881ceefd5a07b98ea1e4a8a47194a..c2dfde0609a0f1e5b40695b6cc498bca10869194 100644 |
--- a/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp |
+++ b/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp |
@@ -85,8 +85,9 @@ static EDisplay equivalentBlockDisplay(EDisplay display) { |
case EDisplay::TableCaption: |
return EDisplay::Block; |
case EDisplay::None: |
+ case EDisplay::Contents: |
ASSERT_NOT_REACHED(); |
- return EDisplay::None; |
+ return display; |
} |
ASSERT_NOT_REACHED(); |
return EDisplay::Block; |
@@ -369,7 +370,8 @@ static void adjustStyleForDisplay(ComputedStyle& style, |
void StyleAdjuster::adjustComputedStyle(ComputedStyle& style, |
const ComputedStyle& parentStyle, |
Element* element) { |
- if (style.display() != EDisplay::None) { |
+ if (style.display() != EDisplay::None && |
+ style.display() != EDisplay::Contents) { |
if (element && element->isHTMLElement()) |
adjustStyleForHTMLElement(style, toHTMLElement(*element)); |