Changeset 131464 in webkit

Timestamp:

Oct 16, 2012 9:23:43 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Meta] [Shadow] contenteditable attribute for distributed nodes.
​https://bugs.webkit.org/show_bug.cgi?id=90017

Patch by Takashi Sakamoto <​tasak@google.com> on 2012-10-16
Reviewed by Dimitri Glazkov.

Source/WebCore:

If an element is distributed to an insertion point, the element's
webkit-user-modify is inherited from its shadow host.

No new tests, because the existing test: user-modify-inheritance.html
covers this change.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::styleForElement):
After an element inherits a style from its parent, override user-modify
by using the shadow host's style if the element is distributed.

LayoutTests:

• fast/dom/shadow/user-modify-inheritance-expected.txt:
• fast/dom/shadow/user-modify-inheritance.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/user-modify-inheritance-expected.txt (modified) (1 diff)
• LayoutTests/fast/dom/shadow/user-modify-inheritance.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-16  Takashi Sakamoto  <tasak@google.com>
+
+        [Meta] [Shadow] contenteditable attribute for distributed nodes.
+        https://bugs.webkit.org/show_bug.cgi?id=90017
+
+        Reviewed by Dimitri Glazkov.
+
+        * fast/dom/shadow/user-modify-inheritance-expected.txt:
+        * fast/dom/shadow/user-modify-inheritance.html:
+
 2012-10-16  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/LayoutTests/fast/dom/shadow/user-modify-inheritance-expected.txt

@@ -11 +11 @@
 PASS computedStyle(prepareNodeInShadowRoot(document.getElementById("non-contenteditable-host3"), "true"), userModifyPropertyName) is "read-write"
 PASS getUserModifyProperty("child-a") is "read-write"
-FAIL getUserModifyProperty("child-b") should be read-write. Was read-only.
+PASS getUserModifyProperty("child-b") is "read-write"
+PASS getUserModifyProperty("child-c") is "read-only"
+PASS getUserModifyProperty("child-d") is "read-only"
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/dom/shadow/user-modify-inheritance.html

@@ -14 +14 @@
 <div id="non-contenteditable-host3"></div>
 <div id="sandbox"></div>
+<div id="sandbox2"></div>
 <pre id="console"></pre>
 <script>
@@ -63 +64 @@
 
 shouldBeEqualToString('getUserModifyProperty("child-a")', 'read-write');
-/* FIXME(90017): css property: -user-modify should be inherited from parent.*/
 shouldBeEqualToString('getUserModifyProperty("child-b")', 'read-write');
+
+document.getElementById('sandbox2').appendChild(
+    createDOM('div', {'id': 'host', 'contenteditable': 'false'},
+              createShadowRoot(createDOM('content', {'select': '#child-c'}),
+                               createDOM('div', {'contenteditable' : 'true'},
+                                         createDOM('content', {'select': '#child-d'}))),
+              createDOM('div', {'id': 'child-c'}),
+              createDOM('div', {'id': 'child-d'})));
+
+shouldBeEqualToString('getUserModifyProperty("child-c")', 'read-only');
+shouldBeEqualToString('getUserModifyProperty("child-d")', 'read-only');
 
 </script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-16  Takashi Sakamoto  <tasak@google.com>
+
+        [Meta] [Shadow] contenteditable attribute for distributed nodes.
+        https://bugs.webkit.org/show_bug.cgi?id=90017
+
+        Reviewed by Dimitri Glazkov.
+
+        If an element is distributed to an insertion point, the element's
+        webkit-user-modify is inherited from its shadow host.
+
+        No new tests, because the existing test: user-modify-inheritance.html
+        covers this change.
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::styleForElement):
+        After an element inherits a style from its parent, override user-modify
+        by using the shadow host's style if the element is distributed.
+
 2012-10-16  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -1544 +1544 @@
         m_parentStyle = cloneForParent.get();
     }
+    // contenteditable attribute (implemented by -webkit-user-modify) should
+    // be propagated from shadow host to distributed node.
+    if (m_distributedToInsertionPoint) {
+        ASSERT(element->parentElement());
+        ASSERT(element->parentElement()->renderStyle());
+        m_style->setUserModify(element->parentElement()->renderStyle()->userModify());
+    }
 
     if (element->isLink()) {