Changeset 21742 in webkit

Timestamp:

May 24, 2007 6:28:55 PM (17 years ago)

Author:

weinig

Message:

LayoutTests:

Reviewed by Hyatt.

Test cases for:
​http://bugs.webkit.org/show_bug.cgi?id=4104
first-letter not updating style with hover
​http://bugs.webkit.org/show_bug.cgi?id=13169
css-formatted first letter won't hide dynamically

• fast/css/first-letter-hover-expected.checksum: Added.
• fast/css/first-letter-hover-expected.png: Added.
• fast/css/first-letter-hover-expected.txt: Added.
• fast/css/first-letter-hover.html: Added.
• fast/css/first-letter-visibility-expected.checksum: Added.
• fast/css/first-letter-visibility-expected.png: Added.
• fast/css/first-letter-visibility-expected.txt: Added.
• fast/css/first-letter-visibility.html: Added.

WebCore:

Reviewed by Hyatt.

​http://bugs.webkit.org/show_bug.cgi?id=4104
first-letter not updating style with hover
​http://bugs.webkit.org/show_bug.cgi?id=13169
css-formatted first letter won't hide dynamically

Update first letter when RenderBlock::setStyle is called.

• css/cssstyleselector.cpp: (WebCore::CSSStyleSelector::checkOneSelector):
• dom/Document.cpp: (WebCore::Document::Document): (WebCore::Document::createElement):
• dom/Document.h: (WebCore::Document::usesFirstLetterRules): (WebCore::Document::setUsesFirstLetterRules):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::setStyle): (WebCore::RenderBlock::updateFirstLetter):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/first-letter-hover-expected.checksum (added)
• LayoutTests/fast/css/first-letter-hover-expected.png (added)
• LayoutTests/fast/css/first-letter-hover-expected.txt (added)
• LayoutTests/fast/css/first-letter-hover.html (added)
• LayoutTests/fast/css/first-letter-visibility-expected.checksum (added)
• LayoutTests/fast/css/first-letter-visibility-expected.png (added)
• LayoutTests/fast/css/first-letter-visibility-expected.txt (added)
• LayoutTests/fast/css/first-letter-visibility.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/cssstyleselector.cpp (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/dom/Document.h (modified) (2 diffs)
• WebCore/rendering/RenderBlock.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-05-24  Rob Buis  <buis@kde.org>
+
+        Reviewed by Hyatt.
+
+        Test cases for:
+        http://bugs.webkit.org/show_bug.cgi?id=4104
+        first-letter not updating style with hover
+        http://bugs.webkit.org/show_bug.cgi?id=13169
+        css-formatted first letter won't hide dynamically
+
+        * fast/css/first-letter-hover-expected.checksum: Added.
+        * fast/css/first-letter-hover-expected.png: Added.
+        * fast/css/first-letter-hover-expected.txt: Added.
+        * fast/css/first-letter-hover.html: Added.
+        * fast/css/first-letter-visibility-expected.checksum: Added.
+        * fast/css/first-letter-visibility-expected.png: Added.
+        * fast/css/first-letter-visibility-expected.txt: Added.
+        * fast/css/first-letter-visibility.html: Added.
+
 2007-05-24  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-24  Rob Buis  <buis@kde.org>
+
+        Reviewed by Hyatt.
+
+        http://bugs.webkit.org/show_bug.cgi?id=4104
+        first-letter not updating style with hover
+        http://bugs.webkit.org/show_bug.cgi?id=13169
+        css-formatted first letter won't hide dynamically
+
+        Update first letter when RenderBlock::setStyle is called. 
+
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::checkOneSelector):
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::createElement):
+        * dom/Document.h:
+        (WebCore::Document::usesFirstLetterRules):
+        (WebCore::Document::setUsesFirstLetterRules):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::setStyle):
+        (WebCore::RenderBlock::updateFirstLetter):
+
 2007-05-24  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/css/cssstyleselector.cpp

@@ -1587 +1587 @@
                 if (subject) {
                     dynamicPseudo = RenderStyle::FIRST_LETTER;
+                    if (Document* doc = e->document())
+                        doc->setUsesFirstLetterRules(true);
                     return true;
                 }

trunk/WebCore/dom/Document.cpp

@@ -307 +307 @@
     m_usesSiblingRules = false;
     m_usesFirstLineRules = false;
+    m_usesFirstLetterRules = false;
 
     m_styleSelector = new CSSStyleSelector(this, m_usersheet, m_styleSheets.get(), !inCompatMode());

trunk/WebCore/dom/Document.h

@@ -289 +289 @@
     bool usesFirstLineRules() const { return m_usesFirstLineRules; }
     void setUsesFirstLineRules(bool b) { m_usesFirstLineRules = b; }
+    bool usesFirstLetterRules() const { return m_usesFirstLetterRules; }
+    void setUsesFirstLetterRules(bool b) { m_usesFirstLetterRules = b; }
 
     // Machinery for saving and restoring state when you leave and then go back to a page.
@@ -725 +727 @@
     bool m_usesSiblingRules;
     bool m_usesFirstLineRules;
+    bool m_usesFirstLetterRules;
 
     String m_title;

trunk/WebCore/rendering/RenderBlock.cpp

@@ -151 +151 @@
         updateBeforeAfterContent(RenderStyle::AFTER);
     }
+    updateFirstLetter();
 }
 
@@ -4043 +4044 @@
 
 void RenderBlock::updateFirstLetter()
-{    
+{
+    if (!document()->usesFirstLetterRules())
+        return;
+    // Don't recurse
+    if (style()->styleType() == RenderStyle::FIRST_LETTER)
+        return;
+
     // FIXME: We need to destroy the first-letter object if it is no longer the first child.  Need to find
     // an efficient way to check for that situation though before implementing anything.