[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 dd4cc9151e1172eed186f2c1d8f12376f1ebc981
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 20 02:32:11 2002 +0000

    	- another atomic identifier scrub pass; make the conversion to Identifier explicit
    
            * khtml/ecma/kjs_html.cpp:
            (KJS::HTMLCollection::tryCall): Add explicit Identifier() conversion.
            (KJS::HTMLCollectionProtoFunc::tryCall): Ditto.
            * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): And again.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2771 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index eb48bee..1126d2e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-11-19  Darin Adler  <darin at apple.com>
+
+	- another atomic identifier scrub pass; make the conversion to Identifier explicit
+
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLCollection::tryCall): Add explicit Identifier() conversion.
+        (KJS::HTMLCollectionProtoFunc::tryCall): Ditto.
+        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): And again.
+
 2002-11-19  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3049663.  Table cells don't grow to accommodate block
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index eb48bee..1126d2e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-11-19  Darin Adler  <darin at apple.com>
+
+	- another atomic identifier scrub pass; make the conversion to Identifier explicit
+
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLCollection::tryCall): Add explicit Identifier() conversion.
+        (KJS::HTMLCollectionProtoFunc::tryCall): Ditto.
+        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): And again.
+
 2002-11-19  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3049663.  Table cells don't grow to accommodate block
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index eb48bee..1126d2e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-11-19  Darin Adler  <darin at apple.com>
+
+	- another atomic identifier scrub pass; make the conversion to Identifier explicit
+
+        * khtml/ecma/kjs_html.cpp:
+        (KJS::HTMLCollection::tryCall): Add explicit Identifier() conversion.
+        (KJS::HTMLCollectionProtoFunc::tryCall): Ditto.
+        * khtml/ecma/kjs_window.cpp: (WindowFunc::tryCall): And again.
+
 2002-11-19  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3049663.  Table cells don't grow to accommodate block
diff --git a/WebCore/khtml/ecma/kjs_html.cpp b/WebCore/khtml/ecma/kjs_html.cpp
index ddd5879..8bfa8a8 100644
--- a/WebCore/khtml/ecma/kjs_html.cpp
+++ b/WebCore/khtml/ecma/kjs_html.cpp
@@ -2735,7 +2735,7 @@ Value KJS::HTMLCollection::tryCall(ExecState *exec, Object &, const List &args)
       return getDOMNode(exec,element);
     }
     // support for document.images('<name>') etc.
-    return getNamedItems(exec,s);
+    return getNamedItems(exec, Identifier(s));
   }
   else if (args.size() >= 1) // the second arg, if set, is the index of the item we want
   {
@@ -2829,7 +2829,7 @@ Value KJS::HTMLCollectionProtoFunc::tryCall(ExecState *exec, Object &thisObj, co
     return getDOMNodeList(exec, list);
   }
   case KJS::HTMLCollection::NamedItem:
-    return static_cast<HTMLCollection *>(thisObj.imp())->getNamedItems(exec, args[0].toString(exec));
+    return static_cast<HTMLCollection *>(thisObj.imp())->getNamedItems(exec, Identifier(args[0].toString(exec)));
   default:
     return Undefined();
   }
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index ddffe55..5fadf97 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -1278,7 +1278,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
   case Window::SetTimeout:
     if (args.size() == 2 && v.isA(StringType)) {
       int i = args[1].toInt32(exec);
-      int r = (const_cast<Window*>(window))->installTimeout(s, i, true /*single shot*/);
+      int r = (const_cast<Window*>(window))->installTimeout(Identifier(s), i, true /*single shot*/);
       return Number(r);
     }
     else if (args.size() >= 2 && v.isA(ObjectType) && Object::dynamicCast(v).implementsCall()) {
@@ -1290,7 +1290,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
       funcArgs->removeFirst(); // all args after 2 go to the function
       funcArgs->removeFirst();
 #endif
-      int r = (const_cast<Window*>(window))->installTimeout(s, i, true /*single shot*/);
+      int r = (const_cast<Window*>(window))->installTimeout(Identifier(s), i, true /*single shot*/);
       return Number(r);
     }
     else
@@ -1298,7 +1298,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
   case Window::SetInterval:
     if (args.size() >= 2 && v.isA(StringType)) {
       int i = args[1].toInt32(exec);
-      int r = (const_cast<Window*>(window))->installTimeout(s, i, false);
+      int r = (const_cast<Window*>(window))->installTimeout(Identifier(s), i, false);
       return Number(r);
     }
     else if (args.size() >= 2 && !Object::dynamicCast(v).isNull() &&
@@ -1311,7 +1311,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
       funcArgs->removeFirst(); // all args after 2 go to the function
       funcArgs->removeFirst();
 #endif
-      int r = (const_cast<Window*>(window))->installTimeout(s, i, false);
+      int r = (const_cast<Window*>(window))->installTimeout(Identifier(s), i, false);
       return Number(r);
     }
     else

-- 
WebKit Debian packaging