Changeset 14278 in webkit
- Timestamp:
- May 9, 2006 11:56:13 PM (18 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r14277 r14278 1 2006-05-09 Mitz Pettel <opendarwin.org@mitzpettel.com> 2 3 Reviewed by Hyatt. 4 5 - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=8760 6 crash (hang?) on subtlegradient.com article page 7 8 * manual-tests/first-line-style-crash.html: Added. 9 10 * css/cssstyleselector.cpp: 11 (WebCore::CSSStyleSelector::createStyleForElement): Changed to not return the 12 shared styleNotYetAvailable if allowSharing is off. 13 * rendering/RenderObject.cpp: 14 (WebCore::RenderObject::getPseudoStyle): In the FIRST_LINE_INHERITED case, 15 set the styleType on the style returned from createStyleForElement(). 16 * rendering/render_style.h: 17 (WebCore::RenderStyle::setStyleType): Added. Called from RenderObject::getPseudoStyle(). 18 1 19 2006-05-09 Mitz Pettel <opendarwin.org@mitzpettel.com> 2 20 -
trunk/WebCore/css/cssstyleselector.cpp
r14273 r14278 687 687 RenderStyle* CSSStyleSelector::styleForElement(Element* e, RenderStyle* defaultParent, bool allowSharing) 688 688 { 689 if ( !e->document()->haveStylesheetsLoaded()) {689 if (allowSharing && !e->document()->haveStylesheetsLoaded()) { 690 690 if (!styleNotYetAvailable) { 691 691 styleNotYetAvailable = ::new RenderStyle(); -
trunk/WebCore/rendering/RenderObject.cpp
r14273 r14278 2362 2362 return 0; 2363 2363 2364 if (pseudo == RenderStyle::FIRST_LINE_INHERITED) 2364 if (pseudo == RenderStyle::FIRST_LINE_INHERITED) { 2365 2365 result = document()->styleSelector()->styleForElement(static_cast<Element*>(node), parentStyle, false); 2366 else 2366 result->setStyleType(RenderStyle::FIRST_LINE_INHERITED); 2367 } else 2367 2368 result = document()->styleSelector()->pseudoStyleForElement(pseudo, static_cast<Element*>(node), parentStyle); 2368 2369 if (result) { -
trunk/WebCore/rendering/render_style.h
r14273 r14278 1087 1087 1088 1088 PseudoId styleType() { return static_cast<PseudoId>(noninherited_flags._styleType); } 1089 void setStyleType(PseudoId styleType) { noninherited_flags._styleType = styleType; } 1089 1090 1090 1091 RenderStyle* getPseudoStyle(PseudoId pi);
Note: See TracChangeset
for help on using the changeset viewer.