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

[Adele]

adele       05/08/10 10:19:23

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/ecma Tag: Safari-2-0-branch xmlserializer.cpp
  Log:
          Merged fix from TOT to Safari-2-0-branch.
  
          * khtml/ecma/xmlserializer.cpp: (KJS::XMLSerializerProtoFunc::tryCall):
          changes made to tryCall, which has been renamed on TOT.
  
      2005-08-09  Vicki Murley  <vicki at apple.com>
  
          Fixed by Anders Carlsson, Reviewed by Maciej.
  
  	- fixed <rdar://problem/4071417> add XMLSerializer object to WebCore's JavaScript support (4046)
  
          Test cases added:
          * layout-tests/fast/dom/XMLSerializer-expected.txt: Added.
          * layout-tests/fast/dom/XMLSerializer.html: Added.
  
          * khtml/ecma/xmlserializer.cpp:
          (KJS::XMLSerializerProtoFunc::callAsFunction): allow any node to be serialized, not just documents
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.107 +20 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.106
  retrieving revision 1.4104.2.107
  diff -u -r1.4104.2.106 -r1.4104.2.107
  --- ChangeLog	10 Aug 2005 02:48:25 -0000	1.4104.2.106
  +++ ChangeLog	10 Aug 2005 17:19:15 -0000	1.4104.2.107
  @@ -1,3 +1,23 @@
  +2005-08-10  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch.
  +
  +        * khtml/ecma/xmlserializer.cpp: (KJS::XMLSerializerProtoFunc::tryCall): 
  +        changes made to tryCall, which has been renamed on TOT.
  +
  +    2005-08-09  Vicki Murley  <vicki at apple.com>
  +
  +        Fixed by Anders Carlsson, Reviewed by Maciej.
  +
  +	- fixed <rdar://problem/4071417> add XMLSerializer object to WebCore's JavaScript support (4046)
  + 
  +        Test cases added: 
  +        * layout-tests/fast/dom/XMLSerializer-expected.txt: Added.
  +        * layout-tests/fast/dom/XMLSerializer.html: Added.
  +
  +        * khtml/ecma/xmlserializer.cpp:
  +        (KJS::XMLSerializerProtoFunc::callAsFunction): allow any node to be serialized, not just documents
  +
   2005-08-09  Geoffrey Garen  <ggaren at apple.com>
   
           -fixed <rdar://problem/4197421> crash in ObjectImp::findPropertyHashEntry at ifilm.com
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.28.2  +6 -5      WebCore/khtml/ecma/xmlserializer.cpp
  
  Index: xmlserializer.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/ecma/xmlserializer.cpp,v
  retrieving revision 1.1.28.1
  retrieving revision 1.1.28.2
  diff -u -r1.1.28.1 -r1.1.28.2
  --- xmlserializer.cpp	24 May 2005 17:06:41 -0000	1.1.28.1
  +++ xmlserializer.cpp	10 Aug 2005 17:19:23 -0000	1.1.28.2
  @@ -27,6 +27,8 @@
   
   #include <kdebug.h>
   
  +using DOM::NodeImpl;
  +
   using namespace KJS;
   
   ////////////////////// XMLSerializer Object ////////////////////////
  @@ -84,21 +86,20 @@
   	return Undefined();
         }
   
  -      if (!args[0].toObject(exec).inherits(&DOMDocument::info)) {
  +      if (!args[0].toObject(exec).inherits(&DOMNode::info)) {
   	return Undefined();
         }
   
  -      DOM::Node docNode = static_cast<KJS::DOMDocument *>(args[0].toObject(exec).imp())->toNode();
  -      DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl *>(docNode.handle());
  +      NodeImpl *node = static_cast<NodeImpl *>(static_cast<DOMNode *>(args[0].toObject(exec).imp())->toNode().handle());
   
  -      if (!doc) {
  +      if (!node) {
   	return Undefined();
         }
   	  
         QString body;
   
         try {
  -	  body = doc->toString().string();
  +	  body = node->toString().string();
         } catch(DOM::DOMException& e) {
   	  Object err = Error::create(exec, GeneralError, "Exception serializing document");
   	  exec->setException(err);