[webkit-changes] cvs commit: WebCore/khtml/rendering render_style.cpp

[David]

hyatt       05/06/10 18:58:02

  Modified:    .        ChangeLog
               khtml/css cssstyleselector.cpp
               khtml/rendering render_style.cpp
  Log:
  	Merge Allan Jensen's fix for 3236.
  
          Reviewed by hyatt
  
          Test cases added: None, test case already added for the bug.
  
          * khtml/css/cssstyleselector.cpp:
          (khtml::CSSStyleSelector::applyProperty):
          * khtml/rendering/render_style.cpp:
          (RenderStyle::setContent):
  
  Revision  Changes    Path
  1.4255    +13 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4254
  retrieving revision 1.4255
  diff -u -r1.4254 -r1.4255
  --- ChangeLog	10 Jun 2005 18:02:54 -0000	1.4254
  +++ ChangeLog	11 Jun 2005 01:57:58 -0000	1.4255
  @@ -1,3 +1,16 @@
  +2005-06-10  David Hyatt  <hyatt at apple.com>
  +
  +	Merge Allan Jensen's fix for 3236.
  +	
  +        Reviewed by hyatt
  +
  +        Test cases added: None, test case already added for the bug.
  +
  +        * khtml/css/cssstyleselector.cpp:
  +        (khtml::CSSStyleSelector::applyProperty):
  +        * khtml/rendering/render_style.cpp:
  +        (RenderStyle::setContent):
  +
   2005-06-10  Darin Adler  <darin at apple.com>
   
           Change by Mark Rowe <opendarwin.org at bdash.net.nz>.
  
  
  
  1.185     +2 -6      WebCore/khtml/css/cssstyleselector.cpp
  
  Index: cssstyleselector.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/css/cssstyleselector.cpp,v
  retrieving revision 1.184
  retrieving revision 1.185
  diff -u -r1.184 -r1.185
  --- cssstyleselector.cpp	10 Jun 2005 06:47:36 -0000	1.184
  +++ cssstyleselector.cpp	11 Jun 2005 01:58:01 -0000	1.185
  @@ -3042,12 +3042,8 @@
                   // just the hardcoded HTML set.  Can a namespace be specified for
                   // an attr(foo)?
                   int attrID = element->getDocument()->attrId(0, val->getStringValue().implementation(), false);
  -                if (attrID) {
  -                    DOMStringImpl* v = element->getAttribute(attrID).implementation();
  -                    if (!v)
  -                        v = DOMStringImpl::empty(); // Don't allow v to be null, since we want to concatenate this string even if it's empty.
  -                    style->setContent(v, i != 0);
  -                }  
  +                if (attrID)
  +                    style->setContent(element->getAttribute(attrID).implementation(), i != 0);
               }
               else if (val->primitiveType()==CSSPrimitiveValue::CSS_URI)
               {
  
  
  
  1.66      +1 -4      WebCore/khtml/rendering/render_style.cpp
  
  Index: render_style.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_style.cpp,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- render_style.cpp	18 Mar 2005 20:41:58 -0000	1.65
  +++ render_style.cpp	11 Jun 2005 01:58:02 -0000	1.66
  @@ -924,10 +924,7 @@
           lastContent = lastContent->_nextContent;
   
       bool reuseContent = !add;
  -    if (add) {
  -        if (!lastContent)
  -            return; // Something's wrong.  We had no previous content, and we should have.
  -
  +    if (add && lastContent) {
           if (lastContent->_contentType == CONTENT_TEXT) {
               // We can augment the existing string and share this ContentData node.
               DOMStringImpl* oldStr = lastContent->_content.text;