Changeset 35027 in webkit for trunk/JavaScriptCore/kjs/PropertyMap.cpp

Timestamp:

Jul 6, 2008, 7:49:29 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-07-06 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Second step in broad cleanup effort.

[ File list elided ]

WebCore:

2008-07-06 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Add #include for kjs/protect.h.

• xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::loadRequestAsynchronously):

File:

• trunk/JavaScriptCore/kjs/PropertyMap.cpp (modified) (16 diffs)

trunk/JavaScriptCore/kjs/PropertyMap.cpp

@@ -64 +64 @@
 static int numRemoves;
 
-struct PropertyMapStatisticsExitLogger { ~PropertyMapStatisticsExitLogger(); };
+struct PropertyMapStatisticsExitLogger {
+    ~PropertyMapStatisticsExitLogger();
+};
 
 static PropertyMapStatisticsExitLogger logger;
@@ -86 +88 @@
 
     PropertyMapEntry(UString::Rep* k, JSValue* v, int a)
-        : key(k), value(v), attributes(a), index(0)
+        : key(k)
+        , value(v)
+        , attributes(a)
+        , index(0)
     {
     }
@@ -143 +148 @@
         return;
     }
-    
+
     unsigned entryCount = m_u.table->keyCount + m_u.table->deletedSentinelCount;
     for (unsigned i = 1; i <= entryCount; i++) {
@@ -175 +180 @@
 }
 
-JSValue* PropertyMap::get(const Identifier& name, unsigned& attributes) const
-{
-    ASSERT(!name.isNull());
-    
-    UString::Rep* rep = name._ustring.rep();
-    
+JSValue* PropertyMap::get(const Identifier& propertyName, unsigned& attributes) const
+{
+    ASSERT(!propertyName.isNull());
+
+    UString::Rep* rep = propertyName._ustring.rep();
+
     if (!m_usingTable) {
 #if USE_SINGLE_ENTRY
@@ -190 +195 @@
         return 0;
     }
-    
+
     unsigned i = rep->computedHash();
 
@@ -230 +235 @@
 }
 
-JSValue* PropertyMap::get(const Identifier& name) const
-{
-    ASSERT(!name.isNull());
-    
-    UString::Rep* rep = name._ustring.rep();
-    
+JSValue* PropertyMap::get(const Identifier& propertyName) const
+{
+    ASSERT(!propertyName.isNull());
+
+    UString::Rep* rep = propertyName._ustring.rep();
+
     if (!m_usingTable) {
 #if USE_SINGLE_ENTRY
@@ -243 +248 @@
         return 0;
     }
-    
+
     unsigned i = rep->computedHash();
 
@@ -279 +284 @@
 }
 
-JSValue** PropertyMap::getLocation(const Identifier& name)
-{
-    ASSERT(!name.isNull());
-    
-    UString::Rep* rep = name._ustring.rep();
-    
+JSValue** PropertyMap::getLocation(const Identifier& propertyName)
+{
+    ASSERT(!propertyName.isNull());
+
+    UString::Rep* rep = propertyName._ustring.rep();
+
     if (!m_usingTable) {
 #if USE_SINGLE_ENTRY
@@ -292 +297 @@
         return 0;
     }
-    
+
     unsigned i = rep->computedHash();
 
@@ -328 +333 @@
 }
 
-JSValue** PropertyMap::getLocation(const Identifier& name, bool& isWriteable)
-{
-    ASSERT(!name.isNull());
-    
-    UString::Rep* rep = name._ustring.rep();
-    
+JSValue** PropertyMap::getLocation(const Identifier& propertyName, bool& isWriteable)
+{
+    ASSERT(!propertyName.isNull());
+
+    UString::Rep* rep = propertyName._ustring.rep();
+
     if (!m_usingTable) {
 #if USE_SINGLE_ENTRY
@@ -343 +348 @@
         return 0;
     }
-    
+
     unsigned i = rep->computedHash();
 
@@ -383 +388 @@
 }
 
-void PropertyMap::put(const Identifier& name, JSValue* value, unsigned attributes, bool checkReadOnly)
-{
-    ASSERT(!name.isNull());
+void PropertyMap::put(const Identifier& propertyName, JSValue* value, unsigned attributes, bool checkReadOnly)
+{
+    ASSERT(!propertyName.isNull());
     ASSERT(value);
-    
+
     checkConsistency();
 
-    UString::Rep* rep = name._ustring.rep();
-    
+    UString::Rep* rep = propertyName._ustring.rep();
+
 #if USE_SINGLE_ENTRY
     if (!m_usingTable) {
@@ -429 +434 @@
 
         if (m_u.table->entries()[entryIndex - 1].key == rep) {
-            if (checkReadOnly && (m_u.table->entries()[entryIndex - 1].attributes & ReadOnly)) 
+            if (checkReadOnly && (m_u.table->entries()[entryIndex - 1].attributes & ReadOnly))
                 return;
             // Put a new value in an existing hash table entry.
@@ -467 +472 @@
         // slot that we can use. We know it will be there because we did at least one
         // deletion in the past that left an entry empty.
-        while (m_u.table->entries()[--entryIndex - 1].key)
-            ;
-    }
-
+        while (m_u.table->entries()[--entryIndex - 1].key) { }
+    }
 
     // Create a new hash table entry.
@@ -574 +577 @@
 
     Table* oldTable = m_u.table;
-    
+
     m_u.table = static_cast<Table*>(fastZeroedMalloc(Table::allocationSize(newTableSize)));
     m_u.table->size = newTableSize;
@@ -594 +597 @@
 }
 
-void PropertyMap::remove(const Identifier& name)
-{
-    ASSERT(!name.isNull());
-    
+void PropertyMap::remove(const Identifier& propertyName)
+{
+    ASSERT(!propertyName.isNull());
+
     checkConsistency();
 
-    UString::Rep* rep = name._ustring.rep();
+    UString::Rep* rep = propertyName._ustring.rep();
 
     if (!m_usingTable) {