Changeset 217599 in webkit

Timestamp:

May 31, 2017 5:18:24 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Use the rare data's RenderStyle for display: contents.
​https://bugs.webkit.org/show_bug.cgi?id=172721

Patch by Emilio Cobos Álvarez <​ecobos@igalia.com> on 2017-05-31
Reviewed by Antti Koivisto.

No new tests, no behavior change.

• dom/Element.cpp:

(WebCore::Element::hasDisplayContents):
(WebCore::Element::storeDisplayContentsStyle):

• dom/Element.h:
• dom/ElementRareData.h:

(WebCore::ElementRareData::ElementRareData):

• style/RenderTreeUpdater.cpp:

(WebCore::RenderTreeUpdater::updateElementRenderer):

• style/StyleTreeResolver.cpp:

(WebCore::Style::TreeResolver::resolveComposedTree):

Location:

trunk

Files:

• LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)
• Source/WebCore/dom/Element.h (modified) (1 diff)
• Source/WebCore/dom/ElementRareData.h (modified) (3 diffs)
• Source/WebCore/style/RenderTreeUpdater.cpp (modified) (1 diff)
• Source/WebCore/style/StyleTreeResolver.cpp (modified) (1 diff)

trunk/LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt

@@ -1 +1 @@
 Pass.
 WebKit didn't Crash.
+

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-31  Emilio Cobos Álvarez  <ecobos@igalia.com>
+
+        Use the rare data's RenderStyle for display: contents.
+        https://bugs.webkit.org/show_bug.cgi?id=172721
+
+        Reviewed by Antti Koivisto.
+
+        No new tests, no behavior change.
+
+        * dom/Element.cpp:
+        (WebCore::Element::hasDisplayContents):
+        (WebCore::Element::storeDisplayContentsStyle):
+        * dom/Element.h:
+        * dom/ElementRareData.h:
+        (WebCore::ElementRareData::ElementRareData):
+        * style/RenderTreeUpdater.cpp:
+        (WebCore::RenderTreeUpdater::updateElementRenderer):
+        * style/StyleTreeResolver.cpp:
+        (WebCore::Style::TreeResolver::resolveComposedTree):
+
 2017-05-31  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1469 +1469 @@
 bool Element::hasDisplayContents() const
 {
-    return hasRareData() && elementRareData()->hasDisplayContents();
-}
-
-void Element::setHasDisplayContents(bool value)
-{
-    if (hasDisplayContents() == value)
-        return;
-    ensureElementRareData().setHasDisplayContents(value);
+    if (renderer() || !hasRareData())
+        return false;
+    const RenderStyle* style = elementRareData()->computedStyle();
+    return style && style->display() == CONTENTS;
+}
+
+void Element::storeDisplayContentsStyle(std::unique_ptr<RenderStyle> style)
+{
+    ASSERT(style && style->display() == CONTENTS);
+    ASSERT(!renderer());
+    ensureElementRareData().setComputedStyle(WTFMove(style));
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -545 +545 @@
 
     bool hasDisplayContents() const;
-    void setHasDisplayContents(bool);
+    void storeDisplayContentsStyle(std::unique_ptr<RenderStyle>);
 
     using ContainerNode::setAttributeEventListener;

trunk/Source/WebCore/dom/ElementRareData.h

@@ -118 +118 @@
     bool hasPendingResources() const { return m_hasPendingResources; }
     void setHasPendingResources(bool has) { m_hasPendingResources = has; }
-
-    bool hasDisplayContents() const { return m_hasDisplayContents; }
-    void setHasDisplayContents(bool value) { m_hasDisplayContents = value; }
 
 private:
@@ -142 +139 @@
     unsigned m_childrenAffectedByBackwardPositionalRules : 1;
     unsigned m_childrenAffectedByPropertyBasedBackwardPositionalRules : 1;
-    unsigned m_hasDisplayContents : 1;
     unsigned m_isNamedFlowContentElement : 1;
 
@@ -186 +182 @@
     , m_childrenAffectedByBackwardPositionalRules(false)
     , m_childrenAffectedByPropertyBasedBackwardPositionalRules(false)
-    , m_hasDisplayContents(false)
     , m_isNamedFlowContentElement(false)
     , m_regionOversetState(RegionUndefined)

trunk/Source/WebCore/style/RenderTreeUpdater.cpp

@@ -270 +270 @@
     bool hasDisplayContents = update.style->display() == CONTENTS;
     if (hasDisplayContents != element.hasDisplayContents()) {
-        element.setHasDisplayContents(hasDisplayContents);
+        if (!hasDisplayContents)
+            element.resetComputedStyle();
+        else
+            element.storeDisplayContentsStyle(RenderStyle::clonePtr(*update.style));
         // Render tree position needs to be recomputed as rendering siblings may be found from the display:contents subtree.
         renderTreePosition().invalidateNextSibling();

trunk/Source/WebCore/style/StyleTreeResolver.cpp

@@ -422 +422 @@
         bool shouldResolve = shouldResolveElement(element, parent.change) || affectedByPreviousSibling;
         if (shouldResolve) {
-            element.resetComputedStyle();
+            if (!element.hasDisplayContents())
+                element.resetComputedStyle();
             element.resetStyleRelations();