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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:56:40 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit d97137045484b70baab8acb78ab6b714a1198ee4
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 2 01:10:35 2002 +0000

    JavaScriptCore:
    
            * kjs/object.cpp: Make the same change Maciej just did, but to the
    	other constructor right next to the one he changed.
    
    WebFoundation:
    
            * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
    
    WebKit:
    
            * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2535 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index a21c784..e803e63 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-01  Darin Adler  <darin at apple.com>
+
+        * kjs/object.cpp: Make the same change Maciej just did, but to the
+	other constructor right next to the one he changed.
+
 2002-10-31  Maciej Stachowiak  <mjs at apple.com>
 
 	- fixed 3082660 - REGRESSION: one ListImp leaks opening/closing nearly empty web page
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index a21c784..e803e63 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-11-01  Darin Adler  <darin at apple.com>
+
+        * kjs/object.cpp: Make the same change Maciej just did, but to the
+	other constructor right next to the one he changed.
+
 2002-10-31  Maciej Stachowiak  <mjs at apple.com>
 
 	- fixed 3082660 - REGRESSION: one ListImp leaks opening/closing nearly empty web page
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index a21c784..e803e63 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2002-11-01  Darin Adler  <darin at apple.com>
+
+        * kjs/object.cpp: Make the same change Maciej just did, but to the
+	other constructor right next to the one he changed.
+
 2002-10-31  Maciej Stachowiak  <mjs at apple.com>
 
 	- fixed 3082660 - REGRESSION: one ListImp leaks opening/closing nearly empty web page
diff --git a/JavaScriptCore/kjs/object.cpp b/JavaScriptCore/kjs/object.cpp
index 27d888e..c38e878 100644
--- a/JavaScriptCore/kjs/object.cpp
+++ b/JavaScriptCore/kjs/object.cpp
@@ -63,6 +63,7 @@ ObjectImp::ObjectImp(const Object &proto)
 {
   //fprintf(stderr,"ObjectImp::ObjectImp %p\n",(void*)this);
   _scope = ListImp::empty();
+  _scope->setGcAllowed();
   _prop = new PropertyMap();
 }
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 55feac8..a5c4cda 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-01  Darin Adler  <darin at apple.com>
+
+        * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
+
 2002-11-01  Chris Blumenberg  <cblu at apple.com>
 
 	Check that the plug-in is loaded before calling it.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 55feac8..a5c4cda 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,7 @@
+2002-11-01  Darin Adler  <darin at apple.com>
+
+        * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
+
 2002-11-01  Chris Blumenberg  <cblu at apple.com>
 
 	Check that the plug-in is loaded before calling it.
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 1102435..14315f1 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -150,7 +150,6 @@
 "image/png"
 "lastVisitedDate"
 "nullplugin"
-"pluginspage"
 "text/"
 "text/html"
 "text/rtf"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list