[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:33:05 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 7625893070a00f16d9ddd6b2c217460f924c3bfd
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 20 21:53:41 2002 +0000

            * kjs/object.cpp: Don't reference other ValueImps in the
    	destructor, they may ha ve already been destroyed, and will have
    	GC_ALLOWED set already in any case.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1881 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e99d57e..7e5fc8a 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-20  Maciej Stachowiak  <mjs at apple.com>
+
+        * kjs/object.cpp: Don't reference other ValueImps in the
+	destructor, they may ha ve already been destroyed, and will have
+	GC_ALLOWED set already in any case.
+w
 2002-08-19  Maciej Stachowiak  <mjs at apple.com>
 
 	Fixed the bug that made sony.com menus come out wrong and made
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index e99d57e..7e5fc8a 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-08-20  Maciej Stachowiak  <mjs at apple.com>
+
+        * kjs/object.cpp: Don't reference other ValueImps in the
+	destructor, they may ha ve already been destroyed, and will have
+	GC_ALLOWED set already in any case.
+w
 2002-08-19  Maciej Stachowiak  <mjs at apple.com>
 
 	Fixed the bug that made sony.com menus come out wrong and made
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index e99d57e..7e5fc8a 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-08-20  Maciej Stachowiak  <mjs at apple.com>
+
+        * kjs/object.cpp: Don't reference other ValueImps in the
+	destructor, they may ha ve already been destroyed, and will have
+	GC_ALLOWED set already in any case.
+w
 2002-08-19  Maciej Stachowiak  <mjs at apple.com>
 
 	Fixed the bug that made sony.com menus come out wrong and made
diff --git a/JavaScriptCore/kjs/object.cpp b/JavaScriptCore/kjs/object.cpp
index 23f7642..08f0809 100644
--- a/JavaScriptCore/kjs/object.cpp
+++ b/JavaScriptCore/kjs/object.cpp
@@ -79,12 +79,6 @@ ObjectImp::ObjectImp()
 ObjectImp::~ObjectImp()
 {
   //fprintf(stderr,"ObjectImp::~ObjectImp %p\n",(void*)this);
-  if (_proto)
-    _proto->setGcAllowed();
-  if (_internalValue)
-    _internalValue->setGcAllowed();
-  if (_scope)
-    _scope->setGcAllowed();
   delete _prop;
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list