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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit f12e09722ec8cd43b5f70f624b51fd9de46eb6f2
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 14 02:29:08 2003 +0000

    	Factored common code between copy constructor and assignment operator.
    
            Reviewed by Chris.
    
            * ChangeLog:
            * bindings/jni/jni_runtime.h:
            (Bindings::JavaConstructor::_commonCopy):
            (Bindings::JavaConstructor::JavaConstructor):
            (Bindings::JavaConstructor::operator=):
            (Bindings::JavaField::type):
            * bindings/runtime.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5486 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 092cb22..4017738 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,19 @@
 2003-11-13  Richard Williamson   <rjw at apple.com>
 
+	Factored common code between copy constructor and assignment operator.
+
+        Reviewed by Chris.
+
+        * ChangeLog:
+        * bindings/jni/jni_runtime.h:
+        (Bindings::JavaConstructor::_commonCopy):
+        (Bindings::JavaConstructor::JavaConstructor):
+        (Bindings::JavaConstructor::operator=):
+        (Bindings::JavaField::type):
+        * bindings/runtime.h:
+
+2003-11-13  Richard Williamson   <rjw at apple.com>
+
 	More LiveConnect stuff.  This checkin adds abstract classes to model
 	language runtimes and a JNI based set of concrete implementations for
 	Java.
diff --git a/JavaScriptCore/bindings/jni/jni_runtime.h b/JavaScriptCore/bindings/jni/jni_runtime.h
index 68b0284..f5bc618 100644
--- a/JavaScriptCore/bindings/jni/jni_runtime.h
+++ b/JavaScriptCore/bindings/jni/jni_runtime.h
@@ -115,13 +115,17 @@ public:
         delete _parameters;
     };
 
-    JavaConstructor(const JavaConstructor &other) : Constructor() {
+    void _commonCopy(const JavaConstructor &other) {
         _numParameters = other._numParameters;
         _parameters = new JavaParameter[_numParameters];
         long i;
         for (i = 0; i < _numParameters; i++) {
             _parameters[i] = other._parameters[i];
         }
+    }
+    
+    JavaConstructor(const JavaConstructor &other) : Constructor() {
+        _commonCopy (other);
     };
 
     JavaConstructor &operator=(const JavaConstructor &other)
@@ -131,12 +135,7 @@ public:
             
         delete _parameters;
         
-        _numParameters = other._numParameters;
-        _parameters = new JavaParameter[_numParameters];
-        long i;
-        for (i = 0; i < _numParameters; i++) {
-            _parameters[i] = other._parameters[i];
-        }
+        _commonCopy (other);
 
         return *this;
     }
@@ -177,7 +176,7 @@ public:
     }
     
     virtual const char *name() const { return _name->characters(); }
-    virtual const char *type() const { return _type->characters(); }
+    virtual RuntimeType type() const { return _type->characters(); }
     
 private:
     JavaString *_name;
diff --git a/JavaScriptCore/bindings/runtime.h b/JavaScriptCore/bindings/runtime.h
index 846ed23..153b4b3 100644
--- a/JavaScriptCore/bindings/runtime.h
+++ b/JavaScriptCore/bindings/runtime.h
@@ -47,7 +47,7 @@ class Field
 {
 public:
     virtual const char *name() const = 0;
-    virtual const char *type() const = 0;
+    virtual RuntimeType type() const = 0;
     virtual ~Field() {};
 };
 

-- 
WebKit Debian packaging