Changeset 143300 in webkit

Timestamp:

Feb 18, 2013 11:31:43 PM (11 years ago)

Author:

tasak@google.com

Message:

:before/:after pseudo elements do not always apply to the proper element
​https://bugs.webkit.org/show_bug.cgi?id=93925

Reviewed by Dimitri Glazkov.

Source/WebCore:

Disable sharing a style with siblings if :after or :before pseudo style
is unique.

Test: fast/css/before-after-pseudo-class.html

• css/StyleResolver.cpp:

(WebCore::StyleResolver::canShareStyleWithElement):
Added a new condition, hasUniquePseudoStyle.

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::hasUniquePseudoStyle):
Added to check whether any pseudo style has unique bit or not.
(WebCore):

• rendering/style/RenderStyle.h:

LayoutTests:

• fast/css/before-after-pseudo-class-expected.html: Added.
• fast/css/before-after-pseudo-class.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/before-after-pseudo-class-expected.html (added)
• LayoutTests/fast/css/before-after-pseudo-class.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-18  Takashi Sakamoto  <tasak@google.com>
+
+        :before/:after pseudo elements do not always apply to the proper element
+        https://bugs.webkit.org/show_bug.cgi?id=93925
+
+        Reviewed by Dimitri Glazkov.
+
+        * fast/css/before-after-pseudo-class-expected.html: Added.
+        * fast/css/before-after-pseudo-class.html: Added.
+
 2013-02-18  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-18  Takashi Sakamoto  <tasak@google.com>
+
+        :before/:after pseudo elements do not always apply to the proper element
+        https://bugs.webkit.org/show_bug.cgi?id=93925
+
+        Reviewed by Dimitri Glazkov.
+
+        Disable sharing a style with siblings if :after or :before pseudo style
+        is unique.
+
+        Test: fast/css/before-after-pseudo-class.html
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::canShareStyleWithElement):
+        Added a new condition, hasUniquePseudoStyle.
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::hasUniquePseudoStyle):
+        Added to check whether any pseudo style has unique bit or not.
+        (WebCore):
+        * rendering/style/RenderStyle.h:
+
 2013-02-18  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -1014 +1014 @@
     if (style->unique())
         return false;
+    if (style->hasUniquePseudoStyle())
+        return false;
     if (element->tagQName() != state.element()->tagQName())
         return false;

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

@@ -260 +260 @@
     ASSERT(pseudo < FIRST_INTERNAL_PSEUDOID);
     noninherited_flags._pseudoBits |= pseudoBit(pseudo);
+}
+
+bool RenderStyle::hasUniquePseudoStyle() const
+{
+    if (!m_cachedPseudoStyles || styleType() != NOPSEUDO)
+        return false;
+
+    for (size_t i = 0; i < m_cachedPseudoStyles->size(); ++i) {
+        RenderStyle* pseudoStyle = m_cachedPseudoStyles->at(i).get();
+        if (pseudoStyle->unique())
+            return true;
+    }
+
+    return false;
 }
 

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

@@ -424 +424 @@
     bool hasPseudoStyle(PseudoId pseudo) const;
     void setHasPseudoStyle(PseudoId pseudo);
+    bool hasUniquePseudoStyle() const;
 
     // attribute getter methods