Changeset 117716 in webkit

Timestamp:

May 20, 2012 5:50:01 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Needs style recalculation by changing applyAuthorStyles dynamically
​https://bugs.webkit.org/show_bug.cgi?id=84251

Source/WebCore:

Modifying setApplyAuthorStyles to invoke owner()'s
setNeedsRedistributing if applyAuthorStyles changes.

Patch by Takashi Sakamoto <​tasak@google.com> on 2012-05-20
Reviewed by Hajime Morita.

No new tests. Adding new tests to existing
fast/dom/shadow/shadow-root-applyAuthorStyles.html to test this
feature.

• dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::setApplyAuthorStyles):
If applyAuthorStyles changes, invoke owner's setNeedsRedistributing to
recalculate styles of the shadow root's child elements.

LayoutTests:

Patch by Takashi Sakamoto <​tasak@google.com> on 2012-05-20
Reviewed by Hajime Morita.

• fast/dom/shadow/shadow-root-applyAuthorStyles-expected.html:
• fast/dom/shadow/shadow-root-applyAuthorStyles.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/shadow-root-applyAuthorStyles-expected.html (modified) (1 diff)
• LayoutTests/fast/dom/shadow/shadow-root-applyAuthorStyles.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/ShadowRoot.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-20  Takashi Sakamoto  <tasak@google.com>
+
+        Needs style recalculation by changing applyAuthorStyles dynamically
+        https://bugs.webkit.org/show_bug.cgi?id=84251
+
+        Reviewed by Hajime Morita.
+
+        * fast/dom/shadow/shadow-root-applyAuthorStyles-expected.html:
+        * fast/dom/shadow/shadow-root-applyAuthorStyles.html:
+
 2012-05-20  Philip Rogers  <pdr@google.com>
 

trunk/LayoutTests/fast/dom/shadow/shadow-root-applyAuthorStyles-expected.html

@@ -6 +6 @@
 <div id="with-inline-style-declaration"><span style="background-color:#eef;border:none;color:#daa;display:boxed-inline;font-size:18px;margin:2px;outline-color:#f00;padding-left:5px;text-align:start;text-decoration:none;"></span></div>
 <div id="try-to-overide-important"><input type="file" /></div>
+<div id="change-apply-author-style-from-true-to-false"><div><span></span></div></div>
+<div id="change-apply-author-style-from-false-to-true"><div><span style="background-color:#eef;border:solid;color:#fee;display:boxed-inline;font-size:24px;margin:2px;outline-color:#f00;padding-left:5px;text-align:start;text-decoration:underline;"></span></div></div>
 </body>
 </html>

trunk/LayoutTests/fast/dom/shadow/shadow-root-applyAuthorStyles.html

@@ -26 +26 @@
 <div id="with-inline-style-declaration"></div>
 <div id="try-to-override-important"></div>
+<div id="change-apply-author-style-from-true-to-false"></div>
+<div id="change-apply-author-style-from-false-to-true"></div>
 
 <script>
+function shouldBe(a, b)
+{
+   if (a != b) {
+      throw "failure:" + a + ": should be " + b;
+   }
+}
+
+function shouldNotBe(a, b)
+{
+   if (a == b) {
+      throw "failure:" + a + ": should not be " + b;
+   }
+}
+
 function assertTrue(id, actual) {
    if (!actual) {
@@ -84 +100 @@
 }
 
+function testChangingApplyAuthorStyleFromTrueToFalse() {
+    var div = document.createElement('div');
+    document.getElementById('change-apply-author-style-from-true-to-false').appendChild(div);
+
+    var shadowRoot = new WebKitShadowRoot(div);
+    assertFalse('default applyAuthorStyles', shadowRoot.applyAuthorStyles);
+    shadowRoot.applyAuthorStyles = true;
+    assertTrue('applyAuthorStyles should be true', shadowRoot.applyAuthorStyles);
+    shadowRoot.innerHTML = '<div><span id="test1"></span></div>';
+    div.offsetLeft;
+    var target = shadowRoot.getElementById('test1');
+    shouldBe(window.getComputedStyle(target).getPropertyValue('font-size'), "24px");
+    shouldBe(window.getComputedStyle(target).getPropertyValue('text-decoration'), "underline");
+
+    shadowRoot.applyAuthorStyles = false;
+    assertFalse('applyAuthorStyles should be false', shadowRoot.applyAuthorStyles);
+    div.offsetLeft;
+    shouldNotBe(window.getComputedStyle(target).getPropertyValue('font-size'), "24px");
+    shouldNotBe(window.getComputedStyle(target).getPropertyValue('text-decoration'), "underline");
+}
+
+function testChangingApplyAuthorStyleFromFalseToTrue() {
+    var div = document.createElement('div');
+    document.getElementById('change-apply-author-style-from-false-to-true').appendChild(div);
+
+    var shadowRoot = new WebKitShadowRoot(div);
+    shadowRoot.applyAuthorStyles = false;
+    assertFalse('applyAuthorStyles should be false', shadowRoot.applyAuthorStyles);
+    shadowRoot.innerHTML = '<div><span id="test2"></span></div>';
+    div.offsetLeft;
+    var target = shadowRoot.getElementById('test2');
+    shouldNotBe(window.getComputedStyle(target).getPropertyValue('font-size'), "24px");
+    shouldNotBe(window.getComputedStyle(target).getPropertyValue('text-decoration'), "underline");
+
+    shadowRoot.applyAuthorStyles = true;
+    assertTrue('applyAuthorStyles should be true', shadowRoot.applyAuthorStyles);
+    div.offsetLeft;
+    shouldBe(window.getComputedStyle(target).getPropertyValue('font-size'), "24px");
+    shouldBe(window.getComputedStyle(target).getPropertyValue('text-decoration'), "underline");
+}
+
 renderApplyAuthorStyleCase();
 renderNoApplyAuthorStyleCase();
 renderApplyAuthorStyleWithInlineStyleDeclarationCase();
 renderApplyAuthorStyleWithOverridingImportantPropertyCase();
+testChangingApplyAuthorStyleFromTrueToFalse();
+testChangingApplyAuthorStyleFromFalseToTrue();
 </script>
 </body>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-20  Takashi Sakamoto  <tasak@google.com>
+
+        Needs style recalculation by changing applyAuthorStyles dynamically
+        https://bugs.webkit.org/show_bug.cgi?id=84251
+
+        Modifying setApplyAuthorStyles to invoke owner()'s
+        setNeedsRedistributing if applyAuthorStyles changes.
+
+        Reviewed by Hajime Morita.
+
+        No new tests. Adding new tests to existing
+        fast/dom/shadow/shadow-root-applyAuthorStyles.html to test this
+        feature.
+
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::setApplyAuthorStyles):
+        If applyAuthorStyles changes, invoke owner's setNeedsRedistributing to
+        recalculate styles of the shadow root's child elements.
+
 2012-05-20  Philip Rogers  <pdr@google.com>
 

trunk/Source/WebCore/dom/ShadowRoot.cpp

@@ -189 +189 @@
 void ShadowRoot::setApplyAuthorStyles(bool value)
 {
-    m_applyAuthorStyles = value;
+    if (m_applyAuthorStyles != value) {
+        m_applyAuthorStyles = value;
+        if (attached() && owner())
+            owner()->setNeedsRedistributing();
+    }
 }