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

Unified Diff: third_party/WebKit/Source/core/css/resolver/ElementResolveContext.cpp

Issue 2450093005: Support display: contents for elements, first-line and first-letter pseudos. (Closed)
Patch Set: Rebased Created 3 years, 11 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
Index: third_party/WebKit/Source/core/css/resolver/ElementResolveContext.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/ElementResolveContext.cpp b/third_party/WebKit/Source/core/css/resolver/ElementResolveContext.cpp
index f8943953cec6c78057a61055cbc0390ae129844d..c12532cfc1908144835d4a84d9c73bf6cf912587 100644
--- a/third_party/WebKit/Source/core/css/resolver/ElementResolveContext.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/ElementResolveContext.cpp
@@ -33,6 +33,7 @@ namespace blink {
ElementResolveContext::ElementResolveContext(const Document& document)
: m_element(nullptr),
m_parentNode(nullptr),
+ m_layoutParent(nullptr),
m_rootElementStyle(document.documentElement()
? document.documentElement()->computedStyle()
: document.computedStyle()),
@@ -45,10 +46,14 @@ ElementResolveContext::ElementResolveContext(Element& element)
element.document().visitedLinkState().determineLinkState(element)),
m_distributedToInsertionPoint(false) {
LayoutTreeBuilderTraversal::ParentDetails parentDetails;
- m_parentNode =
- element.isActiveSlotOrActiveInsertionPoint()
- ? nullptr
- : LayoutTreeBuilderTraversal::parent(element, &parentDetails);
+ if (element.isActiveSlotOrActiveInsertionPoint()) {
+ m_parentNode = nullptr;
+ m_layoutParent = nullptr;
+ } else {
+ m_parentNode = LayoutTreeBuilderTraversal::parent(element);
+ m_layoutParent =
+ LayoutTreeBuilderTraversal::layoutParent(element, &parentDetails);
+ }
m_distributedToInsertionPoint = parentDetails.insertionPoint();
const Document& document = element.document();

Powered by Google App Engine
This is Rietveld 408576698