Changeset 106885 in webkit

Timestamp:

Feb 6, 2012, 5:37:43 PM (15 years ago)

Author:

haraken@chromium.org

Message:

Unreviewed. Rebaselined run-bindings-tests results.

• bindings/scripts/test/V8/V8TestObj.cpp:

(WebCore::TestObjInternal::optionsObjectCallback):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/test/V8/V8TestObj.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Kentaro Hara  <haraken@chromium.org>
+
+        Unreviewed. Rebaselined run-bindings-tests results.
+
+        * bindings/scripts/test/V8/V8TestObj.cpp:
+        (WebCore::TestObjInternal::optionsObjectCallback):
+
 2012-02-06  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp

@@ -973 +973 @@
     TestObj* imp = V8TestObj::toNative(args.Holder());
     EXCEPTION_BLOCK(OptionsObject, oo, MAYBE_MISSING_PARAMETER(args, 0, MissingIsUndefined));
+    if (args.Length() > 0 && !oo.isUndefinedOrNull() && !oo.isObject()) {
+        ec = TYPE_MISMATCH_ERR;
+        V8Proxy::setDOMException(ec);
+        return throwError("Not an object.", V8Proxy::TypeError);
+    }
     if (args.Length() <= 1) {
         imp->optionsObject(oo);
@@ -978 +983 @@
     }
     EXCEPTION_BLOCK(OptionsObject, ooo, MAYBE_MISSING_PARAMETER(args, 1, MissingIsUndefined));
+    if (args.Length() > 1 && !ooo.isUndefinedOrNull() && !ooo.isObject()) {
+        ec = TYPE_MISMATCH_ERR;
+        V8Proxy::setDOMException(ec);
+        return throwError("Not an object.", V8Proxy::TypeError);
+    }
     imp->optionsObject(oo, ooo);
     return v8::Handle<v8::Value>();