Changeset 12489 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 30, 2006, 11:41:01 PM (19 years ago)

Author:

andersca

Message:

2006-01-30 Anders Carlsson <​[email protected]>

Reviewed by Darin.

Fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6907
REGRESSION: United.com menus messed up due to document.all/MSIE sniff

• kjs/nodes.cpp: (typeStringForValue): Return "undefined" if the given object should masquerade as undefined.

• kjs/object.h: (KJS::JSObject::masqueradeAsUndefined): Rename from isEqualToNull.

• kjs/operations.cpp: (KJS::equal): Update for name change.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/nodes.cpp (modified) (1 diff)
• kjs/object.h (modified) (1 diff)
• kjs/operations.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-01-30  Anders Carlsson  <[email protected]>
+
+        Reviewed by Darin.
+
+        Fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6907
+        REGRESSION: United.com menus messed up due to document.all/MSIE sniff
+        
+        * kjs/nodes.cpp:
+        (typeStringForValue):
+        Return "undefined" if the given object should masquerade as undefined.
+        
+        * kjs/object.h:
+        (KJS::JSObject::masqueradeAsUndefined):
+        Rename from isEqualToNull.
+        
+        * kjs/operations.cpp:
+        (KJS::equal):
+        Update for name change.
+
 2006-01-29  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -849 +849 @@
         return jsString("string");
     default:
-        if (v->isObject() && static_cast<JSObject*>(v)->implementsCall())
-            return jsString("function");
-        else
-            return jsString("object");
+        if (v->isObject()) {
+            // Return "undefined" for objects that should be treated
+            // as null when doing comparisons.
+            if (static_cast<JSObject*>(v)->masqueradeAsUndefined())
+                return jsString("undefined");            
+            else if (static_cast<JSObject*>(v)->implementsCall())
+                return jsString("function");
+        }
+        
+        return jsString("object");
     }
 }

trunk/JavaScriptCore/kjs/object.h

@@ -495 +495 @@
     bool getPropertyAttributes(const Identifier& propertyName, int& attributes) const;
     
-    // Returns whether the object should be treated as null when doing equality comparisons
-    virtual bool isEqualToNull(ExecState *) const { return false; }
+    // Returns whether the object should be treated as undefined when doing equality comparisons
+    virtual bool masqueradeAsUndefined() const { return false; }
     
     // This get function only looks at the property map.

trunk/JavaScriptCore/kjs/operations.cpp

@@ -131 +131 @@
                 return equal(exec, v1, v2->toPrimitive(exec));
             if (t1 == NullType && t2 == ObjectType)
-                return static_cast<JSObject *>(v2)->isEqualToNull(exec);
+                return static_cast<JSObject *>(v2)->masqueradeAsUndefined();
             if (t1 >= ObjectType && (t2 == StringType || t2 == NumberType))
                 return equal(exec, v1->toPrimitive(exec), v2);
             if (t1 == ObjectType && t2 == NullType)
-                return static_cast<JSObject *>(v1)->isEqualToNull(exec);
+                return static_cast<JSObject *>(v1)->masqueradeAsUndefined();
             if (t1 != t2)
                 return false;