[webkit-changes] cvs commit: WebCore/khtml/ecma kjs_binding.cpp

[Adele]

adele       05/08/04 10:55:23

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/ecma Tag: Safari-2-0-branch kjs_binding.cpp
  Log:
         Merged fix from TOT to Safari-2-0-branch
  
      2005-08-04  Geoffrey Garen  <ggaren at apple.com>
  
          - fixed <rdar://problem/4199495> REGRESSION: Safari Crashes on Window Closing Event
  
          Reviewed by darin.
  
          * khtml/ecma/kjs_binding.cpp:
          (KJS::ScriptInterpreter::updateDOMNodeDocument): inserting a node into a new
          document now removes the node from its old document.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.92 +14 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.91
  retrieving revision 1.4104.2.92
  diff -u -r1.4104.2.91 -r1.4104.2.92
  --- ChangeLog	4 Aug 2005 02:37:28 -0000	1.4104.2.91
  +++ ChangeLog	4 Aug 2005 17:55:16 -0000	1.4104.2.92
  @@ -1,3 +1,17 @@
  +2005-08-04  Adele Peterson  <adele at apple.com>
  +
  +       Merged fix from TOT to Safari-2-0-branch
  +
  +    2005-08-04  Geoffrey Garen  <ggaren at apple.com>
  +
  +        - fixed <rdar://problem/4199495> REGRESSION: Safari Crashes on Window Closing Event
  +
  +        Reviewed by darin.
  +
  +        * khtml/ecma/kjs_binding.cpp:
  +        (KJS::ScriptInterpreter::updateDOMNodeDocument): inserting a node into a new
  +        document now removes the node from its old document.
  +
   2005-08-03  Justin Garcia  <justin.garcia at apple.com>
   
           Merging this fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.26.8.5  +3 -1      WebCore/khtml/ecma/kjs_binding.cpp
  
  Index: kjs_binding.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/kjs_binding.cpp,v
  retrieving revision 1.26.8.4
  retrieving revision 1.26.8.5
  diff -u -r1.26.8.4 -r1.26.8.5
  --- kjs_binding.cpp	22 Jul 2005 03:09:48 -0000	1.26.8.4
  +++ kjs_binding.cpp	4 Aug 2005 17:55:23 -0000	1.26.8.5
  @@ -242,8 +242,10 @@
   void ScriptInterpreter::updateDOMNodeDocument(DOM::NodeImpl *node, DOM::DocumentImpl *oldDoc, DOM::DocumentImpl *newDoc)
   {
     DOMNode *cachedObject = getDOMNodeForDocument(oldDoc, node);
  -  if (cachedObject)
  +  if (cachedObject) {
       putDOMNodeForDocument(newDoc, node, cachedObject);
  +    forgetDOMNodeForDocument(oldDoc, node);
  +  }
   }
   
   bool ScriptInterpreter::wasRunByUserGesture() const