Changeset 57657 in webkit

Timestamp:

Apr 15, 2010 11:22:12 AM (14 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=37567, :first-letter inside a :visited link is wrong color. Make sure
that the pseudo style caching allows visited link styles to hang off other pseudo styles.

Reviewed by Anders Carlsson.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::updateFirstLetter):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::getCachedPseudoStyle):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/style/RenderStyle.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-15  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37567, :first-letter inside a :visited link is wrong color.  Make sure
+        that the pseudo style caching allows visited link styles to hang off other pseudo styles.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::updateFirstLetter):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::getCachedPseudoStyle):
+
 2010-04-15  Ben Murdoch  <benm@google.com>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -4733 +4733 @@
             RenderTextFragment* letter = 
                 new (renderArena()) RenderTextFragment(remainingText->node() ? remainingText->node() : remainingText->document(), oldText.get(), 0, length);
-            RefPtr<RenderStyle> newStyle = RenderStyle::create();
-            newStyle->inheritFrom(pseudoStyle);
-            letter->setStyle(newStyle.release());
+            letter->setStyle(pseudoStyle);
             firstLetter->addChild(letter);
 

trunk/WebCore/rendering/style/RenderStyle.cpp

@@ -212 +212 @@
 RenderStyle* RenderStyle::getCachedPseudoStyle(PseudoId pid) const
 {
-    if (!m_cachedPseudoStyle || styleType() != NOPSEUDO)
+    ASSERT(styleType() != VISITED_LINK);
+
+    if (!m_cachedPseudoStyle)
         return 0;
+
+    if (styleType() != NOPSEUDO) {
+        if (pid == VISITED_LINK)
+            return m_cachedPseudoStyle->styleType() == VISITED_LINK ? m_cachedPseudoStyle.get() : 0;
+        return 0;
+    }
+
     RenderStyle* ps = m_cachedPseudoStyle.get();
     while (ps && ps->styleType() != pid)