[webkit-changes] cvs commit: JavaScriptCore/kjs nodes.cpp

[Maciej]

mjs         05/06/08 00:09:50

  Modified:    .        ChangeLog
               kjs      nodes.cpp
  Log:
          Change by Mark Rowe <opendarwin.org at bdash.net.nz>
  	Reviewed by me.
  
  	- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3327
  	(Exception When Setting Style to Invalid Value Lacks Line/File Information)
  
          * kjs/nodes.cpp: Include source file and line number when making exception in
  	KJS_CHECKEXCEPTIONVALUE.
  
  Revision  Changes    Path
  1.707     +11 -0     JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.706
  retrieving revision 1.707
  diff -u -r1.706 -r1.707
  --- ChangeLog	7 Jun 2005 18:34:26 -0000	1.706
  +++ ChangeLog	8 Jun 2005 07:09:49 -0000	1.707
  @@ -1,3 +1,14 @@
  +2005-06-08  Maciej Stachowiak  <mjs at apple.com>
  +
  +        Change by Mark Rowe <opendarwin.org at bdash.net.nz>
  +	Reviewed by me.
  +
  +	- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3327
  +	(Exception When Setting Style to Invalid Value Lacks Line/File Information)
  +
  +        * kjs/nodes.cpp: Include source file and line number when making exception in
  +	KJS_CHECKEXCEPTIONVALUE.
  +
   2005-06-07  Darin Adler  <darin at apple.com>
   
           Change by Toby Peterson <toby at opendarwin.org>.
  
  
  
  1.55      +5 -1      JavaScriptCore/kjs/nodes.cpp
  
  Index: nodes.cpp
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/kjs/nodes.cpp,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- nodes.cpp	29 Apr 2005 00:22:55 -0000	1.54
  +++ nodes.cpp	8 Jun 2005 07:09:50 -0000	1.55
  @@ -73,8 +73,12 @@
       return Completion(Throw, Error::create(exec,GeneralError,"Out of memory"));
   
   #define KJS_CHECKEXCEPTIONVALUE \
  -  if (exec->hadException()) \
  +  if (exec->hadException()) {\
  +    Object exception = exec->exception().toObject(exec); \
  +    exception.put(exec, "line", Number(this->line)); \
  +    exception.put(exec, "sourceURL", String(this->sourceURL)); \
       return exec->exception(); \
  +  }\
     if (Collector::outOfMemory()) \
       return Undefined(); // will be picked up by KJS_CHECKEXCEPTION