Title: [106885] trunk/Source/WebCore
Revision
106885
Author
[email protected]
Date
2012-02-06 17:37:43 -0800 (Mon, 06 Feb 2012)

Log Message

Unreviewed. Rebaselined run-bindings-tests results.

* bindings/scripts/test/V8/V8TestObj.cpp:
(WebCore::TestObjInternal::optionsObjectCallback):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (106884 => 106885)


--- trunk/Source/WebCore/ChangeLog	2012-02-07 01:36:25 UTC (rev 106884)
+++ trunk/Source/WebCore/ChangeLog	2012-02-07 01:37:43 UTC (rev 106885)
@@ -1,3 +1,10 @@
+2012-02-06  Kentaro Hara  <[email protected]>
+
+        Unreviewed. Rebaselined run-bindings-tests results.
+
+        * bindings/scripts/test/V8/V8TestObj.cpp:
+        (WebCore::TestObjInternal::optionsObjectCallback):
+
 2012-02-06  Levi Weintraub  <[email protected]>
 
         Correct usage of LayoutUnits in dom, editing, page, accessibility, inspector, and loader

Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (106884 => 106885)


--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp	2012-02-07 01:36:25 UTC (rev 106884)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp	2012-02-07 01:37:43 UTC (rev 106885)
@@ -972,11 +972,21 @@
         return throwError("Not enough arguments", V8Proxy::TypeError);
     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);
         return v8::Handle<v8::Value>();
     }
     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>();
 }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to