Changeset 60585 in webkit

Timestamp:

Jun 2, 2010 6:19:59 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-02 Jedrzej Nowacki <​jedrzej.nowacki@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

Fix the QScriptValue::strictlyEquals function.

Handling for a few edge cases was added.

New autotest that covers the QScriptValue::strictlyEquals function.

[Qt] QScriptValue::strictlyEquals is broken
​https://bugs.webkit.org/show_bug.cgi?id=36600

• qt/api/qscriptvalue.cpp: (QScriptValue::strictlyEquals):
• qt/api/qscriptvalue_p.h: (QScriptValuePrivate::strictlyEquals):
• qt/tests/qscriptvalue/qscriptvalue.pro:
• qt/tests/qscriptvalue/tst_qscriptvalue.h:
• qt/tests/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp: Added. (tst_QScriptValue::strictlyEquals_initData): (tst_QScriptValue::strictlyEquals_makeData): (tst_QScriptValue::strictlyEquals_test):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• qt/api/qscriptvalue.cpp (modified) (1 diff)
• qt/api/qscriptvalue_p.h (modified) (3 diffs)
• qt/tests/qscriptvalue/qscriptvalue.pro (modified) (1 diff)
• qt/tests/qscriptvalue/tst_qscriptvalue.h (modified) (2 diffs)
• qt/tests/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp (added)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-06-02  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fix the QScriptValue::strictlyEquals function.
+
+        Handling for a few edge cases was added.
+
+        New autotest that covers the QScriptValue::strictlyEquals function.
+
+        [Qt] QScriptValue::strictlyEquals is broken
+        https://bugs.webkit.org/show_bug.cgi?id=36600
+
+        * qt/api/qscriptvalue.cpp:
+        (QScriptValue::strictlyEquals):
+        * qt/api/qscriptvalue_p.h:
+        (QScriptValuePrivate::strictlyEquals):
+        * qt/tests/qscriptvalue/qscriptvalue.pro:
+        * qt/tests/qscriptvalue/tst_qscriptvalue.h:
+        * qt/tests/qscriptvalue/tst_qscriptvalue_generated_comparison.cpp: Added.
+        (tst_QScriptValue::strictlyEquals_initData):
+        (tst_QScriptValue::strictlyEquals_makeData):
+        (tst_QScriptValue::strictlyEquals_test):
+
 2010-06-02  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
 

trunk/JavaScriptCore/qt/api/qscriptvalue.cpp

@@ -584 +584 @@
 bool QScriptValue::strictlyEquals(const QScriptValue& other) const
 {
-    return d_ptr == other.d_ptr || d_ptr->strictlyEquals(QScriptValuePrivate::get(other));
-}
+    return d_ptr->strictlyEquals(QScriptValuePrivate::get(other));
+}

trunk/JavaScriptCore/qt/api/qscriptvalue_p.h

@@ -109 +109 @@
 
     inline bool equals(QScriptValuePrivate* other);
-    inline bool strictlyEquals(const QScriptValuePrivate* other) const;
+    inline bool strictlyEquals(QScriptValuePrivate* other);
     inline bool assignEngine(QScriptEnginePrivate* engine);
 
@@ -622 +622 @@
 }
 
-bool QScriptValuePrivate::strictlyEquals(const QScriptValuePrivate* other) const
-{
-    if (m_state != other->m_state)
-        return false;
+bool QScriptValuePrivate::strictlyEquals(QScriptValuePrivate* other)
+{
     if (isJSBased()) {
+        // We can't compare these two values without binding to the same engine.
+        if (!other->isJSBased()) {
+            if (other->assignEngine(engine()))
+                return JSValueIsStrictEqual(context(), value(), other->value());
+            return false;
+        }
         if (other->engine() != engine()) {
             qWarning("strictlyEquals(): Cannot compare to a value created in a different engine");
@@ -633 +637 @@
         return JSValueIsStrictEqual(context(), value(), other->value());
     }
-    if (isStringBased())
-        return m_string == other->m_string;
-    if (isNumberBased())
-        return m_number == other->m_number;
-
-    return false; // Invalid state.
+    if (isStringBased()) {
+        if (other->isStringBased())
+            return m_string == other->m_string;
+        if (other->isJSBased()) {
+            assignEngine(other->engine());
+            return JSValueIsStrictEqual(context(), value(), other->value());
+        }
+    }
+    if (isNumberBased()) {
+        if (other->isNumberBased())
+            return m_number == other->m_number;
+        if (other->isJSBased()) {
+            assignEngine(other->engine());
+            return JSValueIsStrictEqual(context(), value(), other->value());
+        }
+    }
+    if (!isValid() && !other->isValid())
+        return true;
+
+    return false;
 }
 

trunk/JavaScriptCore/qt/tests/qscriptvalue/qscriptvalue.pro

@@ -8 +8 @@
     tst_qscriptvalue.cpp \
     tst_qscriptvalue_generated_init.cpp \
+    tst_qscriptvalue_generated_comparison.cpp \
     tst_qscriptvalue_generated_istype.cpp \
     tst_qscriptvalue_generated_totype.cpp \

trunk/JavaScriptCore/qt/tests/qscriptvalue/tst_qscriptvalue.h

@@ -104 +104 @@
     void toUInt16();
 
+    void strictlyEquals_data();
+    void strictlyEquals();
+
 private:
     typedef void (tst_QScriptValue::*InitDataFunction)();
@@ -185 +188 @@
     void toUInt16_test(const char*, const QScriptValue&);
 
+    void strictlyEquals_initData();
+    void strictlyEquals_makeData(const char*);
+    void strictlyEquals_test(const char*, const QScriptValue&);
+
 private:
     QScriptEngine* engine;