Changeset 131136 in webkit

Timestamp:

Oct 11, 2012 8:51:37 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Shadow DOM] Insertion points need resetStyleInheritance
​https://bugs.webkit.org/show_bug.cgi?id=93922

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

Source/WebCore:

Implemented resetStyleInheritance of insertion points.
Its spec link is ​http://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/shadow/index.html#api-html-content-element-reset-style-inheritance

Test: fast/dom/shadow/insertion-point-resetStyleInheritance.html

• css/StyleResolver.cpp:

(WebCore::isResetStyleInheritance):
Added a new function to check whether there exists any insertion
point which has reset-style-inhertiance flag set to be true.
(WebCore::StyleResolver::initForStyleResolve):
Modified to use the above function to check reset-style-inheritance.

• html/shadow/HTMLContentElement.idl:
• html/shadow/HTMLShadowElement.idl:

Added a new attribute for reset-style-inheritance.

• html/shadow/InsertionPoint.cpp:

(WebCore::InsertionPoint::InsertionPoint):
Initialized a new member variable for reset-style-inheritance.
(WebCore::InsertionPoint::resetStyleInheritance):
(WebCore::InsertionPoint::setResetStyleInheritance):
Implemented setter/getter for reset-style-inheritance.

• html/shadow/InsertionPoint.h:

(InsertionPoint):
Added a new member variable for reset-style-inheritance.

LayoutTests:

• fast/dom/shadow/insertion-point-resetStyleInheritance-expected.txt: Added.
• fast/dom/shadow/insertion-point-resetStyleInheritance.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/insertion-point-resetStyleInheritance-expected.txt (added)
• LayoutTests/fast/dom/shadow/insertion-point-resetStyleInheritance.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (3 diffs)
• Source/WebCore/html/shadow/HTMLContentElement.idl (modified) (1 diff)
• Source/WebCore/html/shadow/HTMLShadowElement.idl (modified) (1 diff)
• Source/WebCore/html/shadow/InsertionPoint.cpp (modified) (2 diffs)
• Source/WebCore/html/shadow/InsertionPoint.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-11  Takashi Sakamoto  <tasak@google.com>
+
+        [Shadow DOM] Insertion points need resetStyleInheritance
+        https://bugs.webkit.org/show_bug.cgi?id=93922
+
+        Reviewed by Dimitri Glazkov.
+
+        * fast/dom/shadow/insertion-point-resetStyleInheritance-expected.txt: Added.
+        * fast/dom/shadow/insertion-point-resetStyleInheritance.html: Added.
+
 2012-10-11  Kenichi Ishibashi  <bashi@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-11  Takashi Sakamoto  <tasak@google.com>
+
+        [Shadow DOM] Insertion points need resetStyleInheritance
+        https://bugs.webkit.org/show_bug.cgi?id=93922
+
+        Reviewed by Dimitri Glazkov.
+
+        Implemented resetStyleInheritance of insertion points.
+        Its spec link is http://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/shadow/index.html#api-html-content-element-reset-style-inheritance
+
+        Test: fast/dom/shadow/insertion-point-resetStyleInheritance.html
+
+        * css/StyleResolver.cpp:
+        (WebCore::isResetStyleInheritance):
+        Added a new function to check whether there exists any insertion
+        point which has reset-style-inhertiance flag set to be true.
+        (WebCore::StyleResolver::initForStyleResolve):
+        Modified to use the above function to check reset-style-inheritance.
+        * html/shadow/HTMLContentElement.idl:
+        * html/shadow/HTMLShadowElement.idl:
+        Added a new attribute for reset-style-inheritance.
+        * html/shadow/InsertionPoint.cpp:
+        (WebCore::InsertionPoint::InsertionPoint):
+        Initialized a new member variable for reset-style-inheritance.
+        (WebCore::InsertionPoint::resetStyleInheritance):
+        (WebCore::InsertionPoint::setResetStyleInheritance):
+        Implemented setter/getter for reset-style-inheritance.
+        * html/shadow/InsertionPoint.h:
+        (InsertionPoint):
+        Added a new member variable for reset-style-inheritance.
+
 2012-10-11  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -62 +62 @@
 #include "CursorList.h"
 #include "DocumentStyleSheetCollection.h"
+#include "ElementShadow.h"
 #include "FontFeatureValue.h"
 #include "FontValue.h"
@@ -959 +960 @@
 }
 
+inline bool shouldResetStyleInheritance(NodeRenderingContext& context)
+{
+    if (context.resetStyleInheritance())
+        return true;
+
+    InsertionPoint* insertionPoint = context.insertionPoint();
+    if (!insertionPoint)
+        return false;
+    ASSERT(context.node()->parentElement());
+    ElementShadow* shadow = context.node()->parentElement()->shadow();
+    ASSERT(shadow);
+
+    for ( ; insertionPoint; ) {
+        InsertionPoint* youngerInsertionPoint = shadow->insertionPointFor(insertionPoint);
+        if (!youngerInsertionPoint)
+            break;
+        insertionPoint = youngerInsertionPoint;
+    }
+    return insertionPoint->resetStyleInheritance();
+}
+
 inline void StyleResolver::initForStyleResolve(Element* e, RenderStyle* parentStyle, PseudoId pseudoID)
 {
@@ -966 +988 @@
         NodeRenderingContext context(e);
         m_parentNode = context.parentNodeForRenderingAndStyle();
-        m_parentStyle = context.resetStyleInheritance()? 0 :
+        m_parentStyle = shouldResetStyleInheritance(context) ? 0 :
             parentStyle ? parentStyle :
             m_parentNode ? m_parentNode->renderStyle() : 0;

trunk/Source/WebCore/html/shadow/HTMLContentElement.idl

@@ -31 +31 @@
     ] HTMLContentElement : HTMLElement {
         attribute [Reflect] DOMString select;
+        attribute boolean resetStyleInheritance;
     };
 }

trunk/Source/WebCore/html/shadow/HTMLShadowElement.idl

@@ -35 +35 @@
         V8EnabledAtRuntime=shadowDOM
     ] HTMLShadowElement : HTMLElement {
+        attribute boolean resetStyleInheritance;
     };
 

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

@@ -40 +40 @@
 InsertionPoint::InsertionPoint(const QualifiedName& tagName, Document* document)
     : HTMLElement(tagName, document)
+    , m_shouldResetStyleInheritance(false)
 {
 }
@@ -160 +161 @@
 }
 
+bool InsertionPoint::resetStyleInheritance() const
+{
+    return m_shouldResetStyleInheritance;
+}
+
+void InsertionPoint::setResetStyleInheritance(bool value)
+{
+    if (value != m_shouldResetStyleInheritance) {
+        m_shouldResetStyleInheritance = value;
+        if (attached() && isActive())
+            shadowRoot()->host()->setNeedsStyleRecalc();
+    }
+}
+
 } // namespace WebCore

trunk/Source/WebCore/html/shadow/InsertionPoint.h

@@ -56 +56 @@
     virtual bool doesSelectFromHostChildren() const = 0;
 
+    bool resetStyleInheritance() const;
+    void setResetStyleInheritance(bool);
+
     virtual void attach();
     virtual void detach();
@@ -78 +81 @@
 private:
     ContentDistribution m_distribution;
+    bool m_shouldResetStyleInheritance : 1;
 };