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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 7a6eb04178e95ad336d88c116a1dce4380e0bb3c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 21 20:40:23 2003 +0000

            Reviewed by Dave.
    
            - fixed a storage leak
    
            * khtml/rendering/render_style.h: Added a destructor and a private unimplemented assignment
            operator to StyleCSS3InheritedData, since the textShadow field that needs to be allocated
            and deallocated and the default destructor and assignment operator don't do that.
            * khtml/rendering/render_style.cpp: (StyleCSS3InheritedData::~StyleCSS3InheritedData):
            Added destructor that deletes the textShadow object.
    
            - fixed locking for JavaScript debugging tools in Caches window
    
            * kwq/WebCoreJavaScript.mm:
            (+[WebCoreJavaScript rootObjectClasses]): Lock and unlock around call to JavaScriptCore.
            (+[WebCoreJavaScript garbageCollect]): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5841 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e1bcd5d..821be61 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2003-12-21  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed a storage leak
+
+        * khtml/rendering/render_style.h: Added a destructor and a private unimplemented assignment
+        operator to StyleCSS3InheritedData, since the textShadow field that needs to be allocated
+        and deallocated and the default destructor and assignment operator don't do that.
+        * khtml/rendering/render_style.cpp: (StyleCSS3InheritedData::~StyleCSS3InheritedData):
+        Added destructor that deletes the textShadow object.
+
+        - fixed locking for JavaScript debugging tools in Caches window
+
+        * kwq/WebCoreJavaScript.mm:
+        (+[WebCoreJavaScript rootObjectClasses]): Lock and unlock around call to JavaScriptCore.
+        (+[WebCoreJavaScript garbageCollect]): Ditto.
+
 2003-12-19  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3483130, repaint doesn't occur when font is decreased dynamically when at the bottom of
diff --git a/WebCore/khtml/rendering/render_style.cpp b/WebCore/khtml/rendering/render_style.cpp
index dbc676b..3497733 100644
--- a/WebCore/khtml/rendering/render_style.cpp
+++ b/WebCore/khtml/rendering/render_style.cpp
@@ -206,6 +206,11 @@ StyleCSS3InheritedData::StyleCSS3InheritedData(const StyleCSS3InheritedData& o)
     textShadow = o.textShadow ? new ShadowData(*o.textShadow) : 0;
 }
 
+StyleCSS3InheritedData::~StyleCSS3InheritedData()
+{
+    delete textShadow;
+}
+
 bool StyleCSS3InheritedData::operator==(const StyleCSS3InheritedData& o) const
 {
     return shadowDataEquivalent(o);
diff --git a/WebCore/khtml/rendering/render_style.h b/WebCore/khtml/rendering/render_style.h
index 88c5412..3561dde 100644
--- a/WebCore/khtml/rendering/render_style.h
+++ b/WebCore/khtml/rendering/render_style.h
@@ -522,7 +522,7 @@ class StyleCSS3InheritedData : public Shared<StyleCSS3InheritedData>
 {
 public:
     StyleCSS3InheritedData();
-    ~StyleCSS3InheritedData() {}
+    ~StyleCSS3InheritedData();
     StyleCSS3InheritedData(const StyleCSS3InheritedData& o);
 
     bool operator==(const StyleCSS3InheritedData& o) const;
@@ -532,6 +532,9 @@ public:
     bool shadowDataEquivalent(const StyleCSS3InheritedData& o) const;
 
     ShadowData* textShadow;  // Our text shadow information for shadowed text drawing.
+
+private:
+    StyleCSS3InheritedData &operator=(const StyleCSS3InheritedData &);
 };
 
 //------------------------------------------------
diff --git a/WebCore/kwq/WebCoreJavaScript.mm b/WebCore/kwq/WebCoreJavaScript.mm
index 3214272..814b16a 100644
--- a/WebCore/kwq/WebCoreJavaScript.mm
+++ b/WebCore/kwq/WebCoreJavaScript.mm
@@ -55,12 +55,17 @@ using KJS::Interpreter;
 
 + (NSSet *)rootObjectClasses
 {
-    return [(NSSet *)Collector::rootObjectClasses() autorelease];
+    Interpreter::lock();
+    NSSet *classes = (NSSet *)Collector::rootObjectClasses();
+    Interpreter::unlock();
+    return [classes autorelease];
 }
 
 + (void)garbageCollect
 {
+    Interpreter::lock();
     while (Collector::collect()) { }
+    Interpreter::unlock();
 }
 
 + (BOOL)shouldPrintExceptions

-- 
WebKit Debian packaging