[webkit-changes] cvs commit: WebCore/khtml/html html_elementimpl.cpp

[Adele]

adele       05/07/01 16:02:42

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/html Tag: Safari-2-0-branch html_elementimpl.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch
          <rdar://problem/4164966> Crash will occur when double-clicking outerHTML link on W3 DOM test
          <rdar://problem/4164988> support outerHTML on IMG elements
  
      2005-05-09  Adele Peterson  <adele at apple.com>
  
          fix for <rdar://problem/4110775> Crash will occur when double-clicking outerHTML link on W3 DOM test
  
          Reviewed by Darin.
  
          * khtml/html/html_elementimpl.cpp: (HTMLElementImpl::setOuterHTML): added nil check.
          This was causing a crash when you tried to set the outerHTML on an element that was no longer in the DOM tree.
  
      2005-04-20  Vicki Murley  <vicki at apple.com>
  
          Reviewed by hyatt.
  
  	- fixed <rdar://problem/4065447> support outerHTML on IMG elements
  
          * khtml/html/html_elementimpl.cpp:
          (HTMLElementImpl::setOuterHTML):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.40 +24 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.39
  retrieving revision 1.4104.2.40
  diff -u -r1.4104.2.39 -r1.4104.2.40
  --- ChangeLog	1 Jul 2005 22:46:51 -0000	1.4104.2.39
  +++ ChangeLog	1 Jul 2005 23:02:36 -0000	1.4104.2.40
  @@ -1,5 +1,29 @@
   2005-07-01  Adele Peterson  <adele at apple.com>
   
  +        Merged fix from TOT to Safari-2-0-branch
  +        <rdar://problem/4164966> Crash will occur when double-clicking outerHTML link on W3 DOM test
  +        <rdar://problem/4164988> support outerHTML on IMG elements
  +
  +    2005-05-09  Adele Peterson  <adele at apple.com>
  +
  +        fix for <rdar://problem/4110775> Crash will occur when double-clicking outerHTML link on W3 DOM test
  +
  +        Reviewed by Darin.
  +
  +        * khtml/html/html_elementimpl.cpp: (HTMLElementImpl::setOuterHTML): added nil check.  
  +        This was causing a crash when you tried to set the outerHTML on an element that was no longer in the DOM tree.
  +
  +    2005-04-20  Vicki Murley  <vicki at apple.com>
  +
  +        Reviewed by hyatt.
  +
  +	- fixed <rdar://problem/4065447> support outerHTML on IMG elements
  +
  +        * khtml/html/html_elementimpl.cpp:
  +        (HTMLElementImpl::setOuterHTML):
  +
  +2005-07-01  Adele Peterson  <adele at apple.com>
  +
          Merged fix from TOT to Safari-2-0-branch
          <rdar://problem/4164985> Not able to load additional script blocks dynamically
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.76.8.2  +6 -1      WebCore/khtml/html/html_elementimpl.cpp
  
  Index: html_elementimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_elementimpl.cpp,v
  retrieving revision 1.76.8.1
  retrieving revision 1.76.8.2
  diff -u -r1.76.8.1 -r1.76.8.2
  --- html_elementimpl.cpp	27 Apr 2005 00:58:14 -0000	1.76.8.1
  +++ html_elementimpl.cpp	1 Jul 2005 23:02:42 -0000	1.76.8.2
  @@ -851,7 +851,12 @@
   
   bool HTMLElementImpl::setOuterHTML( const DOMString &html )
   {
  -    DocumentFragmentImpl *fragment = createContextualFragment( html );
  +    NodeImpl *p = parent();
  +    if (!p || !p->isHTMLElement())
  +        return false;
  +    HTMLElementImpl *parent = static_cast<HTMLElementImpl *>(p);
  +    DocumentFragmentImpl *fragment = parent->createContextualFragment( html );
  +
       if (fragment == NULL) {
   	return false;
       }