Changeset 209756 in webkit

Timestamp:

Dec 13, 2016 8:08:04 AM (7 years ago)

Author:

Antti Koivisto

Message:

Source/WebCore:
REGRESSION (r198990): Cannot edit content inside <details> in wysiwyg editor
​https://bugs.webkit.org/show_bug.cgi?id=165757

Reviewed by Andreas Kling.

Test: fast/html/details-edit.html

-webkit-user-modify is reset on shadow boundary so it doesn't go through <details> shadow tree.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::styleForElement):
(WebCore::StyleResolver::pseudoStyleForElement):
(WebCore::StyleResolver::styleForPage):
(WebCore::StyleResolver::applyMatchedProperties):

• dom/Node.cpp:

(WebCore::computeEditabilityFromComputedStyle):
(WebCore::Node::computeEditability):

Make -webkit-user-modify (which we would want to get rid of completely eventually) have no effect in shadow trees.
Check for contenteditable directly instead.

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::createInnerTextStyle):

• html/HTMLTextAreaElement.cpp:

(WebCore::HTMLTextAreaElement::createInnerTextStyle):

• html/shadow/TextControlInnerElements.cpp:
• rendering/RenderFlowThread.cpp:

(WebCore::RenderFlowThread::createFlowThreadStyle):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::calculateClipRects):

• rendering/RenderListItem.cpp:

(WebCore::RenderListItem::styleDidChange):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::createAnonymousStyleWithDisplay):
(WebCore::RenderStyle::createStyleInheritingFromPseudoStyle):
(WebCore::RenderStyle::inheritFrom):

Let -webkit-user-modify inherit through shadow boundary as normal.

• rendering/style/RenderStyle.h:

LayoutTests:
REGRESSION (r198990): Safari - Cannot edit content inside <details> in wysiwyg editor
​https://bugs.webkit.org/show_bug.cgi?id=165757

Reviewed by Andreas Kling.

• editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt:
• fast/html/details-edit-expected.txt: Added.
• fast/html/details-edit.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt (modified) (1 diff)
• LayoutTests/fast/html/details-edit-expected.txt (added)
• LayoutTests/fast/html/details-edit.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (4 diffs)
• Source/WebCore/dom/Node.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLInputElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLTextAreaElement.cpp (modified) (1 diff)
• Source/WebCore/html/shadow/TextControlInnerElements.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderFlowThread.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderListItem.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (3 diffs)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-12-13  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (r198990): Safari - Cannot edit content inside <details> in wysiwyg editor
+        https://bugs.webkit.org/show_bug.cgi?id=165757
+
+        Reviewed by Andreas Kling.
+
+        * editing/execCommand/justify-right-then-indent-with-problematic-body-expected.txt:
+        * fast/html/details-edit-expected.txt: Added.
+        * fast/html/details-edit.html: Added.
+
 2016-12-13  Per Arne Vollan  <pvollan@apple.com>
 

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 @@
+2016-12-13  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (r198990): Cannot edit content inside <details> in wysiwyg editor
+        https://bugs.webkit.org/show_bug.cgi?id=165757
+
+        Reviewed by Andreas Kling.
+
+        Test: fast/html/details-edit.html
+
+        -webkit-user-modify is reset on shadow boundary so it doesn't go through <details> shadow tree.
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::styleForElement):
+        (WebCore::StyleResolver::pseudoStyleForElement):
+        (WebCore::StyleResolver::styleForPage):
+        (WebCore::StyleResolver::applyMatchedProperties):
+        * dom/Node.cpp:
+        (WebCore::computeEditabilityFromComputedStyle):
+        (WebCore::Node::computeEditability):
+
+            Make -webkit-user-modify (which we would want to get rid of completely eventually) have no effect in shadow trees.
+            Check for contenteditable directly instead.
+
+        * html/HTMLInputElement.cpp:
+        (WebCore::HTMLInputElement::createInnerTextStyle):
+        * html/HTMLTextAreaElement.cpp:
+        (WebCore::HTMLTextAreaElement::createInnerTextStyle):
+        * html/shadow/TextControlInnerElements.cpp:
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::createFlowThreadStyle):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+        * rendering/RenderListItem.cpp:
+        (WebCore::RenderListItem::styleDidChange):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::createAnonymousStyleWithDisplay):
+        (WebCore::RenderStyle::createStyleInheritingFromPseudoStyle):
+        (WebCore::RenderStyle::inheritFrom):
+
+            Let -webkit-user-modify inherit through shadow boundary as normal.
+
+        * rendering/style/RenderStyle.h:
+
 2016-12-12  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -394 +394 @@
     if (state.parentStyle()) {
         state.setStyle(RenderStyle::createPtr());
-        state.style()->inheritFrom(state.parentStyle(), isAtShadowBoundary(element) ? RenderStyle::AtShadowBoundary : RenderStyle::NotAtShadowBoundary);
+        state.style()->inheritFrom(*state.parentStyle());
     } else {
         state.setStyle(defaultStyleForElement());
@@ -606 +606 @@
     if (m_state.parentStyle()) {
         state.setStyle(RenderStyle::createPtr());
-        state.style()->inheritFrom(m_state.parentStyle());
+        state.style()->inheritFrom(*m_state.parentStyle());
     } else {
         state.setStyle(defaultStyleForElement());
@@ -656 +656 @@
 
     m_state.setStyle(RenderStyle::createPtr());
-    m_state.style()->inheritFrom(m_state.rootElementStyle());
+    m_state.style()->inheritFrom(*m_state.rootElementStyle());
 
     PageRuleCollector collector(m_state, m_ruleSets);
@@ -1339 +1339 @@
             // If the cache item parent style has identical inherited properties to the current parent style then the
             // resulting style will be identical too. We copy the inherited properties over from the cache and are done.
-            state.style()->inheritFrom(cacheItem->renderStyle.get());
+            state.style()->inheritFrom(*cacheItem->renderStyle);
 
             // Unfortunately the link status is treated like an inherited property. We need to explicitly restore it.

trunk/Source/WebCore/dom/Node.cpp

@@ -702 +702 @@
         return Editability::ReadOnly;
 
-    if (document().frame() && document().frame()->page() && document().frame()->page()->isEditable() && !containingShadowRoot())
+    if (isInShadowTree())
+        return HTMLElement::editabilityFromContentEditableAttr(*this);
+
+    if (document().frame() && document().frame()->page() && document().frame()->page()->isEditable())
         return Editability::CanEditRichly;
 

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -1949 +1949 @@
 {
     auto textBlockStyle = RenderStyle::create();
-    textBlockStyle.inheritFrom(&style);
+    textBlockStyle.inheritFrom(style);
     adjustInnerTextStyle(style, textBlockStyle);
 

trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

@@ -570 +570 @@
 {
     auto textBlockStyle = RenderStyle::create();
-    textBlockStyle.inheritFrom(&style);
+    textBlockStyle.inheritFrom(style);
     adjustInnerTextStyle(style, textBlockStyle);
     textBlockStyle.setDisplay(BLOCK);

trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp

@@ -79 +79 @@
 {
     auto innerContainerStyle = RenderStyle::createPtr();
-    innerContainerStyle->inheritFrom(shadowHostStyle);
+    innerContainerStyle->inheritFrom(*shadowHostStyle);
 
     innerContainerStyle->setFlexGrow(1);

trunk/Source/WebCore/rendering/RenderFlowThread.cpp

@@ -72 +72 @@
 {
     auto newStyle = RenderStyle::create();
-    newStyle.inheritFrom(parentStyle);
+    newStyle.inheritFrom(*parentStyle);
     newStyle.setDisplay(BLOCK);
     newStyle.setPosition(AbsolutePosition);

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -6936 +6936 @@
 {
     auto newStyle = RenderStyle::create();
-    newStyle.inheritFrom(&renderer().style());
+    newStyle.inheritFrom(renderer().style());
     
     // Map in our transform.

trunk/Source/WebCore/rendering/RenderListItem.cpp

@@ -80 +80 @@
     // The marker always inherits from the list item, regardless of where it might end
     // up (e.g., in some deeply nested line box). See CSS3 spec.
-    newStyle.inheritFrom(&style());
+    newStyle.inheritFrom(style());
     if (!m_marker) {
         m_marker = createRenderer<RenderListMarker>(*this, WTFMove(newStyle)).leakPtr();

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -113 +113 @@
 {
     auto newStyle = create();
-    newStyle.inheritFrom(&parentStyle);
+    newStyle.inheritFrom(parentStyle);
     newStyle.inheritUnicodeBidiFrom(&parentStyle);
     newStyle.setDisplay(display);
@@ -124 +124 @@
 
     auto style = create();
-    style.inheritFrom(&pseudoStyle);
+    style.inheritFrom(pseudoStyle);
     return style;
 }
@@ -268 +268 @@
 }
 
-void RenderStyle::inheritFrom(const RenderStyle* inheritParent, IsAtShadowBoundary isAtShadowBoundary)
-{
-    if (isAtShadowBoundary == AtShadowBoundary) {
-        // Even if surrounding content is user-editable, shadow DOM should act as a single unit, and not necessarily be editable
-        EUserModify currentUserModify = userModify();
-        rareInheritedData = inheritParent->rareInheritedData;
-        setUserModify(currentUserModify);
-    } else
-        rareInheritedData = inheritParent->rareInheritedData;
-    inherited = inheritParent->inherited;
-    inherited_flags = inheritParent->inherited_flags;
-
-    if (m_svgStyle != inheritParent->m_svgStyle)
-        m_svgStyle.access()->inheritFrom(inheritParent->m_svgStyle.get());
+void RenderStyle::inheritFrom(const RenderStyle& inheritParent)
+{
+    rareInheritedData = inheritParent.rareInheritedData;
+    inherited = inheritParent.inherited;
+    inherited_flags = inheritParent.inherited_flags;
+
+    if (m_svgStyle != inheritParent.m_svgStyle)
+        m_svgStyle.access()->inheritFrom(inheritParent.m_svgStyle.get());
 }
 

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -511 +511 @@
     StyleSelfAlignmentData resolvedJustifySelf(const RenderStyle& parentStyle, ItemPosition normalValueBehaviour) const;
 
-    enum IsAtShadowBoundary {
-        AtShadowBoundary,
-        NotAtShadowBoundary,
-    };
-
-    void inheritFrom(const RenderStyle* inheritParent, IsAtShadowBoundary = NotAtShadowBoundary);
+    void inheritFrom(const RenderStyle& inheritParent);
     void copyNonInheritedFrom(const RenderStyle*);