Changeset 119484 in webkit

Timestamp:

Jun 5, 2012, 5:27:44 AM (14 years ago)

Author:

charles.wei@torchmobile.com.cn

Message:

JSC:need to implement Dictionary::getWithUndefinedOrNullCheck for IDB
​https://bugs.webkit.org/show_bug.cgi?id=88283

Reviewed by Kentaro Hara.

No new tests, idb not working for JSC yet.

• bindings/js/Dictionary.cpp:

(WebCore::Dictionary::getWithUndefinedOrNullCheck):

• bindings/js/Dictionary.h:

(Dictionary):

• bindings/js/JSDictionary.cpp:

(WebCore::JSDictionary::getWithUndefinedOrNullCheck):
(WebCore):

• bindings/js/JSDictionary.h:

(JSDictionary):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/Dictionary.cpp (modified) (1 diff)
• bindings/js/Dictionary.h (modified) (1 diff)
• bindings/js/JSDictionary.cpp (modified) (1 diff)
• bindings/js/JSDictionary.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-05  Charles Wei  <charles.wei@torchmobile.com.cn>
+
+        JSC:need to implement Dictionary::getWithUndefinedOrNullCheck for IDB
+        https://bugs.webkit.org/show_bug.cgi?id=88283
+
+        Reviewed by Kentaro Hara.
+
+        No new tests, idb not working for JSC yet.
+
+        * bindings/js/Dictionary.cpp:
+        (WebCore::Dictionary::getWithUndefinedOrNullCheck):
+        * bindings/js/Dictionary.h:
+        (Dictionary):
+        * bindings/js/JSDictionary.cpp:
+        (WebCore::JSDictionary::getWithUndefinedOrNullCheck):
+        (WebCore):
+        * bindings/js/JSDictionary.h:
+        (JSDictionary):
+
 2012-06-05  Dongwoo Im  <dw.im@samsung.com>
 

trunk/Source/WebCore/bindings/js/Dictionary.cpp

@@ -80 +80 @@
 }
 
+bool Dictionary::getWithUndefinedOrNullCheck(const String& propertyName, String& value) const
+{
+    return m_dictionary.getWithUndefinedOrNullCheck(propertyName, value);
+}
+
 };
-

trunk/Source/WebCore/bindings/js/Dictionary.h

@@ -62 +62 @@
     bool isUndefinedOrNull() const { return !m_dictionary.isValid(); }
     bool getOwnPropertiesAsStringHashMap(WTF::HashMap<String, String>&) const;
-    bool getWithUndefinedOrNullCheck(const String&, String&) const { notImplemented(); return false; }
+    bool getWithUndefinedOrNullCheck(const String& propertyName, String& value) const;
 
 private:

trunk/Source/WebCore/bindings/js/JSDictionary.cpp

@@ -168 +168 @@
 #endif
 
+bool JSDictionary::getWithUndefinedOrNullCheck(const String& propertyName, String& result) const
+{
+    JSValue value;
+    if (tryGetProperty(propertyName.utf8().data(), value) != PropertyFound || value.isUndefinedOrNull())
+        return false;
+
+    result = ustringToString(value.toString(m_exec)->value(m_exec));
+    return true;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/bindings/js/JSDictionary.h

@@ -59 +59 @@
     template <typename Result>
     bool get(const char* propertyName, Result&) const;
+    bool getWithUndefinedOrNullCheck(const String& propertyName, String& value) const;
 
     JSC::ExecState* execState() const { return m_exec; }