Changeset 14278 in webkit

Timestamp:

May 9, 2006 11:56:13 PM (18 years ago)

Author:

darin

Message:

Reviewed by Hyatt.

• fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=8760 crash (hang?) on subtlegradient.com article page

• manual-tests/first-line-style-crash.html: Added.

• css/cssstyleselector.cpp: (WebCore::CSSStyleSelector::createStyleForElement): Changed to not return the shared styleNotYetAvailable if allowSharing is off.
• rendering/RenderObject.cpp: (WebCore::RenderObject::getPseudoStyle): In the FIRST_LINE_INHERITED case, set the styleType on the style returned from createStyleForElement().
• rendering/render_style.h: (WebCore::RenderStyle::setStyleType): Added. Called from RenderObject::getPseudoStyle().

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/cssstyleselector.cpp (modified) (1 diff)
• manual-tests/first-line-style-crash.html (added)
• rendering/RenderObject.cpp (modified) (1 diff)
• rendering/render_style.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-05-09  Mitz Pettel  <opendarwin.org@mitzpettel.com>
+
+        Reviewed by Hyatt.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=8760
+          crash (hang?) on subtlegradient.com article page
+
+        * manual-tests/first-line-style-crash.html: Added.
+
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::createStyleForElement): Changed to not return the
+        shared styleNotYetAvailable if allowSharing is off.
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::getPseudoStyle): In the FIRST_LINE_INHERITED case,
+        set the styleType on the style returned from createStyleForElement().
+        * rendering/render_style.h:
+        (WebCore::RenderStyle::setStyleType): Added. Called from RenderObject::getPseudoStyle().
+
 2006-05-09  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 

trunk/WebCore/css/cssstyleselector.cpp

@@ -687 +687 @@
 RenderStyle* CSSStyleSelector::styleForElement(Element* e, RenderStyle* defaultParent, bool allowSharing)
 {
-    if (!e->document()->haveStylesheetsLoaded()) {
+    if (allowSharing && !e->document()->haveStylesheetsLoaded()) {
         if (!styleNotYetAvailable) {
             styleNotYetAvailable = ::new RenderStyle();

trunk/WebCore/rendering/RenderObject.cpp

@@ -2362 +2362 @@
         return 0;
     
-    if (pseudo == RenderStyle::FIRST_LINE_INHERITED)
+    if (pseudo == RenderStyle::FIRST_LINE_INHERITED) {
         result = document()->styleSelector()->styleForElement(static_cast<Element*>(node), parentStyle, false);
-    else
+        result->setStyleType(RenderStyle::FIRST_LINE_INHERITED);
+    } else
         result = document()->styleSelector()->pseudoStyleForElement(pseudo, static_cast<Element*>(node), parentStyle);
     if (result) {

trunk/WebCore/rendering/render_style.h

@@ -1087 +1087 @@
 
     PseudoId styleType() { return  static_cast<PseudoId>(noninherited_flags._styleType); }
+    void setStyleType(PseudoId styleType) { noninherited_flags._styleType = styleType; }
 
     RenderStyle* getPseudoStyle(PseudoId pi);