Changeset 83400 in webkit

Timestamp:

Apr 10, 2011 10:35:54 AM (13 years ago)

Author:

Dimitri Glazkov

Message:

2011-04-10 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Anders Carlsson.

REGRESSION(r83256): Text-decoration bleeds into shadow DOM
​https://bugs.webkit.org/show_bug.cgi?id=58205

• platform/chromium/test_expectations.txt: Removed the test that starts

passing after this change.

2011-04-10 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Anders Carlsson.

REGRESSION(r83256): Text-decoration bleeds into shadow DOM
​https://bugs.webkit.org/show_bug.cgi?id=58205

Now that the shadow root is a never-styled element, we need to walk to
parent to find out if we're inside of a shadow DOM subtree.

Test: media/controls-styling.html

• css/CSSStyleSelector.cpp: (WebCore::isAtShadowBoundary): Added helper function. (WebCore::CSSStyleSelector::adjustRenderStyle): Changed to use the helper.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-10  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Anders Carlsson.
+
+        REGRESSION(r83256): Text-decoration bleeds into shadow DOM
+        https://bugs.webkit.org/show_bug.cgi?id=58205
+
+        * platform/chromium/test_expectations.txt: Removed the test that starts
+            passing after this change.
+
 2011-04-10  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3451 +3451 @@
 BUGWK58193 WIN VISTA : svg/text/text-fonts-01-t.svg = IMAGE
 BUGWK58193 WIN VISTA : svg/text/text-intro-05-t.svg = IMAGE
-
-BUGWK58205 : media/controls-styling.html = IMAGE

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-10  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Anders Carlsson.
+
+        REGRESSION(r83256): Text-decoration bleeds into shadow DOM
+        https://bugs.webkit.org/show_bug.cgi?id=58205
+
+        Now that the shadow root is a never-styled element, we need to walk to
+        parent to find out if we're inside of a shadow DOM subtree.
+
+        Test: media/controls-styling.html
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::isAtShadowBoundary): Added helper function.
+        (WebCore::CSSStyleSelector::adjustRenderStyle): Changed to use the helper.
+
 2011-04-07  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -1843 +1843 @@
 }
 
+static inline bool isAtShadowBoundary(Element* element)
+{
+    if (!element)
+        return false;
+
+    ContainerNode* parentNode = element->parentNode();
+    return parentNode && parentNode->isShadowBoundary();
+}
+
 void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, RenderStyle* parentStyle, Element *e)
 {
@@ -1967 +1976 @@
     // tables, inline blocks, inline tables, run-ins, or shadow DOM.
     if (style->display() == TABLE || style->display() == INLINE_TABLE || style->display() == RUN_IN
-        || style->display() == INLINE_BLOCK || style->display() == INLINE_BOX || (e && e->isShadowRoot()))
+        || style->display() == INLINE_BLOCK || style->display() == INLINE_BOX || isAtShadowBoundary(e))
         style->setTextDecorationsInEffect(style->textDecoration());
     else