[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 07:05:51 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 32782811a7978c92e005695f77f775780ebe973d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 21 17:36:13 2002 +0000

    JavaScriptCore:
    
            * kjs/property_map.cpp: More assertions.
    
    WebCore:
    
            * force-js-clean-timestamp: Trigger a rebuild because of the
    	size change in ValueImp.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2804 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1183af6..d58615b 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,9 @@
 2002-11-21  Darin Adler  <darin at apple.com>
 
+        * kjs/property_map.cpp: More assertions.
+
+2002-11-21  Darin Adler  <darin at apple.com>
+
         * kjs/property_map.cpp: Turn that consistency check back off.
 
 2002-11-21  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 1183af6..d58615b 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,5 +1,9 @@
 2002-11-21  Darin Adler  <darin at apple.com>
 
+        * kjs/property_map.cpp: More assertions.
+
+2002-11-21  Darin Adler  <darin at apple.com>
+
         * kjs/property_map.cpp: Turn that consistency check back off.
 
 2002-11-21  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 1183af6..d58615b 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,5 +1,9 @@
 2002-11-21  Darin Adler  <darin at apple.com>
 
+        * kjs/property_map.cpp: More assertions.
+
+2002-11-21  Darin Adler  <darin at apple.com>
+
         * kjs/property_map.cpp: Turn that consistency check back off.
 
 2002-11-21  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/kjs/property_map.cpp b/JavaScriptCore/kjs/property_map.cpp
index 1ce0629..ee759d2 100644
--- a/JavaScriptCore/kjs/property_map.cpp
+++ b/JavaScriptCore/kjs/property_map.cpp
@@ -260,6 +260,7 @@ void PropertyMap::remove(const Identifier &name)
     // Remove the one key.
     key->deref();
     _table[i].key = 0;
+    assert(_keyCount >= 1);
     --_keyCount;
     
     // Reinsert all the items to the right in the same cluster.
@@ -372,7 +373,7 @@ void PropertyMap::checkConsistency()
 #endif
     assert(count == _keyCount);
     if (_table) {
-        assert(_tableSize);
+        assert(_tableSize >= 16);
         assert(_tableSizeMask);
         assert(_tableSize == _tableSizeMask + 1);
     }
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 0934df1..e5fa9ec 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-11-21  Darin Adler  <darin at apple.com>
 
+        * force-js-clean-timestamp: Trigger a rebuild because of the
+	size change in ValueImp.
+
+2002-11-21  Darin Adler  <darin at apple.com>
+
 	- fixed 3107286 -- REGRESSION: unrepro assertion failure in KWQKHTMLPart.mm keyEvent
 
         * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::keyEvent):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0934df1..e5fa9ec 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2002-11-21  Darin Adler  <darin at apple.com>
 
+        * force-js-clean-timestamp: Trigger a rebuild because of the
+	size change in ValueImp.
+
+2002-11-21  Darin Adler  <darin at apple.com>
+
 	- fixed 3107286 -- REGRESSION: unrepro assertion failure in KWQKHTMLPart.mm keyEvent
 
         * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::keyEvent):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0934df1..e5fa9ec 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2002-11-21  Darin Adler  <darin at apple.com>
 
+        * force-js-clean-timestamp: Trigger a rebuild because of the
+	size change in ValueImp.
+
+2002-11-21  Darin Adler  <darin at apple.com>
+
 	- fixed 3107286 -- REGRESSION: unrepro assertion failure in KWQKHTMLPart.mm keyEvent
 
         * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::keyEvent):
diff --git a/WebCore/force-js-clean-timestamp b/WebCore/force-js-clean-timestamp
index 20540a8..3106f9e 100644
--- a/WebCore/force-js-clean-timestamp
+++ b/WebCore/force-js-clean-timestamp
@@ -1,2 +1 @@
-some change 11/20 - Darin
-
+ValueImp size change 11/21 - Darin

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list