Diff
Modified: trunk/Source/WebCore/ChangeLog (104410 => 104411)
--- trunk/Source/WebCore/ChangeLog 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/ChangeLog 2012-01-08 22:48:35 UTC (rev 104411)
@@ -1,5 +1,32 @@
2012-01-08 Adam Barth <[email protected]>
+ Remove deprecated toDynamicFrame and unused [CallWith=DynamicFrame]
+ https://bugs.webkit.org/show_bug.cgi?id=75795
+
+ Reviewed by Eric Seidel.
+
+ We've succeeded in removing all the callers fo this function, including
+ all the uses of CallWith=DynamicFrame in IDL files.
+
+ * bindings/js/JSDOMBinding.cpp:
+ * bindings/js/JSDOMBinding.h:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateParametersCheck):
+ * bindings/scripts/CodeGeneratorV8.pm:
+ (GenerateFunctionCallString):
+ * bindings/scripts/test/CPP/WebDOMTestObj.cpp:
+ * bindings/scripts/test/CPP/WebDOMTestObj.h:
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
+ * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ * bindings/scripts/test/JS/JSTestObj.h:
+ * bindings/scripts/test/ObjC/DOMTestObj.h:
+ * bindings/scripts/test/ObjC/DOMTestObj.mm:
+ * bindings/scripts/test/TestObj.idl:
+ * bindings/scripts/test/V8/V8TestObj.cpp:
+
+2012-01-08 Adam Barth <[email protected]>
+
NeedsUserGestureCheck IDL attribute is no longer used
https://bugs.webkit.org/show_bug.cgi?id=75794
Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (104410 => 104411)
--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2012-01-08 22:48:35 UTC (rev 104411)
@@ -244,12 +244,6 @@
frame->domWindow()->printErrorMessage(message);
}
-// FIXME: We should remove or at least deprecate this function. Callers can use firstDOMWindow directly.
-Frame* toDynamicFrame(ExecState* exec)
-{
- return firstDOMWindow(exec)->frame();
-}
-
JSValue objectToStringFunctionGetter(ExecState* exec, JSValue, const Identifier& propertyName)
{
return JSFunction::create(exec, exec->lexicalGlobalObject(), 0, propertyName, objectProtoFuncToString);
Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.h (104410 => 104411)
--- trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.h 2012-01-08 22:48:35 UTC (rev 104411)
@@ -294,8 +294,6 @@
void printErrorMessageForFrame(Frame*, const String& message);
JSC::JSValue objectToStringFunctionGetter(JSC::ExecState*, JSC::JSValue, const JSC::Identifier& propertyName);
- Frame* toDynamicFrame(JSC::ExecState*);
-
inline JSC::JSValue jsString(JSC::ExecState* exec, const String& s)
{
StringImpl* stringImpl = s.impl();
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (104410 => 104411)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-01-08 22:48:35 UTC (rev 104411)
@@ -2444,12 +2444,7 @@
my $callWith = $function->signature->extendedAttributes->{"CallWith"};
if ($callWith and !$function->signature->extendedAttributes->{"Constructor"}) {
my $callWithArg = "COMPILE_ASSERT(false)";
- if ($callWith eq "DynamicFrame") {
- push(@$outputArray, " Frame* dynamicFrame = toDynamicFrame(exec);\n");
- push(@$outputArray, " if (!dynamicFrame)\n");
- push(@$outputArray, " return JSValue::encode(jsUndefined());\n");
- $callWithArg = "dynamicFrame";
- } elsif ($callWith eq "ScriptState") {
+ if ($callWith eq "ScriptState") {
$callWithArg = "exec";
} elsif ($callWith eq "ScriptExecutionContext") {
push(@$outputArray, " ScriptExecutionContext* scriptContext = static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();\n");
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (104410 => 104411)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-01-08 22:48:35 UTC (rev 104411)
@@ -3196,12 +3196,7 @@
my $callWith = $function->signature->extendedAttributes->{"CallWith"};
if ($callWith) {
my $callWithArg = "COMPILE_ASSERT(false)";
- if ($callWith eq "DynamicFrame") {
- $result .= $indent . "Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();\n";
- $result .= $indent . "if (!enteredFrame)\n";
- $result .= $indent . " return v8::Undefined();\n";
- $callWithArg = "enteredFrame";
- } elsif ($callWith eq "ScriptState") {
+ if ($callWith eq "ScriptState") {
$result .= $indent . "EmptyScriptState state;\n";
$callWithArg = "&state";
$hasScriptState = 1;
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp (104410 => 104411)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp 2012-01-08 22:48:35 UTC (rev 104411)
@@ -760,30 +760,6 @@
impl()->removeEventListener(type, toWebCore(listener), useCapture);
}
-void WebDOMTestObj::withDynamicFrame()
-{
- if (!impl())
- return;
-
- impl()->withDynamicFrame();
-}
-
-void WebDOMTestObj::withDynamicFrameAndArg(int intArg)
-{
- if (!impl())
- return;
-
- impl()->withDynamicFrameAndArg(intArg);
-}
-
-void WebDOMTestObj::withDynamicFrameAndOptionalArg(int intArg, int optionalArg)
-{
- if (!impl())
- return;
-
- impl()->withDynamicFrameAndOptionalArg(intArg, optionalArg);
-}
-
void WebDOMTestObj::withScriptStateVoid()
{
if (!impl())
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h (104410 => 104411)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h 2012-01-08 22:48:35 UTC (rev 104411)
@@ -163,9 +163,6 @@
void customMethodWithArgs(int intArg, const WebDOMString& strArg, const WebDOMTestObj& objArg);
void addEventListener(const WebDOMString& type, const WebDOMEventListener& listener, bool useCapture);
void removeEventListener(const WebDOMString& type, const WebDOMEventListener& listener, bool useCapture);
- void withDynamicFrame();
- void withDynamicFrameAndArg(int intArg);
- void withDynamicFrameAndOptionalArg(int intArg, int optionalArg);
void withScriptStateVoid();
WebDOMTestObj withScriptStateObj();
void withScriptStateVoidException();
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (104410 => 104411)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2012-01-08 22:48:35 UTC (rev 104411)
@@ -230,33 +230,6 @@
}
void
-webkit_dom_test_obj_with_dynamic_frame(WebKitDOMTestObj* self)
-{
- g_return_if_fail(self);
- WebCore::JSMainThreadNullState state;
- WebCore::TestObj * item = WebKit::core(self);
- item->withDynamicFrame();
-}
-
-void
-webkit_dom_test_obj_with_dynamic_frame_and_arg(WebKitDOMTestObj* self, glong int_arg)
-{
- g_return_if_fail(self);
- WebCore::JSMainThreadNullState state;
- WebCore::TestObj * item = WebKit::core(self);
- item->withDynamicFrameAndArg(int_arg);
-}
-
-void
-webkit_dom_test_obj_with_dynamic_frame_and_optional_arg(WebKitDOMTestObj* self, glong int_arg, glong optional_arg)
-{
- g_return_if_fail(self);
- WebCore::JSMainThreadNullState state;
- WebCore::TestObj * item = WebKit::core(self);
- item->withDynamicFrameAndOptionalArg(int_arg, optional_arg);
-}
-
-void
webkit_dom_test_obj_with_script_state_void(WebKitDOMTestObj* self)
{
g_return_if_fail(self);
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h (104410 => 104411)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2012-01-08 22:48:35 UTC (rev 104411)
@@ -174,39 +174,6 @@
webkit_dom_test_obj_method_with_exception(WebKitDOMTestObj* self, GError **error);
/**
- * webkit_dom_test_obj_with_dynamic_frame:
- * @self: A #WebKitDOMTestObj
- *
- * Returns:
- *
-**/
-WEBKIT_API void
-webkit_dom_test_obj_with_dynamic_frame(WebKitDOMTestObj* self);
-
-/**
- * webkit_dom_test_obj_with_dynamic_frame_and_arg:
- * @self: A #WebKitDOMTestObj
- * @int_arg: A #glong
- *
- * Returns:
- *
-**/
-WEBKIT_API void
-webkit_dom_test_obj_with_dynamic_frame_and_arg(WebKitDOMTestObj* self, glong int_arg);
-
-/**
- * webkit_dom_test_obj_with_dynamic_frame_and_optional_arg:
- * @self: A #WebKitDOMTestObj
- * @int_arg: A #glong
- * @optional_arg: A #glong
- *
- * Returns:
- *
-**/
-WEBKIT_API void
-webkit_dom_test_obj_with_dynamic_frame_and_optional_arg(WebKitDOMTestObj* self, glong int_arg, glong optional_arg);
-
-/**
* webkit_dom_test_obj_with_script_state_void:
* @self: A #WebKitDOMTestObj
*
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (104410 => 104411)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2012-01-08 22:48:35 UTC (rev 104411)
@@ -241,9 +241,6 @@
{ "customArgsAndException", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionCustomArgsAndException), (intptr_t)1, NoIntrinsic },
{ "addEventListener", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionAddEventListener), (intptr_t)3, NoIntrinsic },
{ "removeEventListener", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionRemoveEventListener), (intptr_t)3, NoIntrinsic },
- { "withDynamicFrame", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionWithDynamicFrame), (intptr_t)0, NoIntrinsic },
- { "withDynamicFrameAndArg", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionWithDynamicFrameAndArg), (intptr_t)1, NoIntrinsic },
- { "withDynamicFrameAndOptionalArg", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionWithDynamicFrameAndOptionalArg), (intptr_t)2, NoIntrinsic },
{ "withScriptStateVoid", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionWithScriptStateVoid), (intptr_t)0, NoIntrinsic },
{ "withScriptStateObj", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionWithScriptStateObj), (intptr_t)0, NoIntrinsic },
{ "withScriptStateVoidException", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionWithScriptStateVoidException), (intptr_t)0, NoIntrinsic },
@@ -268,7 +265,7 @@
{ 0, 0, 0, 0, NoIntrinsic }
};
-static const HashTable JSTestObjPrototypeTable = { 136, 127, JSTestObjPrototypeTableValues, 0 };
+static const HashTable JSTestObjPrototypeTable = { 135, 127, JSTestObjPrototypeTableValues, 0 };
const ClassInfo JSTestObjPrototype::s_info = { "TestObjPrototype", &Base::s_info, &JSTestObjPrototypeTable, 0, CREATE_METHOD_TABLE(JSTestObjPrototype) };
JSObject* JSTestObjPrototype::self(ExecState* exec, JSGlobalObject* globalObject)
@@ -1306,71 +1303,6 @@
return JSValue::encode(jsUndefined());
}
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithDynamicFrame(ExecState* exec)
-{
- JSValue thisValue = exec->hostThisValue();
- if (!thisValue.inherits(&JSTestObj::s_info))
- return throwVMTypeError(exec);
- JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
- ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
- TestObj* impl = static_cast<TestObj*>(castedThis->impl());
- Frame* dynamicFrame = toDynamicFrame(exec);
- if (!dynamicFrame)
- return JSValue::encode(jsUndefined());
- impl->withDynamicFrame(dynamicFrame);
- return JSValue::encode(jsUndefined());
-}
-
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithDynamicFrameAndArg(ExecState* exec)
-{
- JSValue thisValue = exec->hostThisValue();
- if (!thisValue.inherits(&JSTestObj::s_info))
- return throwVMTypeError(exec);
- JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
- ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
- TestObj* impl = static_cast<TestObj*>(castedThis->impl());
- if (exec->argumentCount() < 1)
- return throwVMError(exec, createTypeError(exec, "Not enough arguments"));
- Frame* dynamicFrame = toDynamicFrame(exec);
- if (!dynamicFrame)
- return JSValue::encode(jsUndefined());
- int intArg(MAYBE_MISSING_PARAMETER(exec, 0, MissingIsUndefined).toInt32(exec));
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
- impl->withDynamicFrameAndArg(dynamicFrame, intArg);
- return JSValue::encode(jsUndefined());
-}
-
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithDynamicFrameAndOptionalArg(ExecState* exec)
-{
- JSValue thisValue = exec->hostThisValue();
- if (!thisValue.inherits(&JSTestObj::s_info))
- return throwVMTypeError(exec);
- JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
- ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
- TestObj* impl = static_cast<TestObj*>(castedThis->impl());
- if (exec->argumentCount() < 1)
- return throwVMError(exec, createTypeError(exec, "Not enough arguments"));
- Frame* dynamicFrame = toDynamicFrame(exec);
- if (!dynamicFrame)
- return JSValue::encode(jsUndefined());
- int intArg(MAYBE_MISSING_PARAMETER(exec, 0, MissingIsUndefined).toInt32(exec));
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
-
- size_t argsCount = exec->argumentCount();
- if (argsCount <= 1) {
- impl->withDynamicFrameAndOptionalArg(dynamicFrame, intArg);
- return JSValue::encode(jsUndefined());
- }
-
- int optionalArg(MAYBE_MISSING_PARAMETER(exec, 1, MissingIsUndefined).toInt32(exec));
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
- impl->withDynamicFrameAndOptionalArg(dynamicFrame, intArg, optionalArg);
- return JSValue::encode(jsUndefined());
-}
-
EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateVoid(ExecState* exec)
{
JSValue thisValue = exec->hostThisValue();
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h (104410 => 104411)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2012-01-08 22:48:35 UTC (rev 104411)
@@ -166,9 +166,6 @@
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionCustomArgsAndException(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionAddEventListener(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionRemoveEventListener(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithDynamicFrame(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithDynamicFrameAndArg(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithDynamicFrameAndOptionalArg(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateVoid(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateObj(JSC::ExecState*);
JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithScriptStateVoidException(JSC::ExecState*);
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h (104410 => 104411)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h 2012-01-08 22:48:35 UTC (rev 104411)
@@ -155,9 +155,6 @@
- (void)customArgsAndException:(DOMlog *)intArg;
- (void)addEventListener:(NSString *)type listener:(id <DOMEventListener>)listener useCapture:(BOOL)useCapture;
- (void)removeEventListener:(NSString *)type listener:(id <DOMEventListener>)listener useCapture:(BOOL)useCapture;
-- (void)withDynamicFrame;
-- (void)withDynamicFrameAndArg:(int)intArg;
-- (void)withDynamicFrameAndOptionalArg:(int)intArg optionalArg:(int)optionalArg;
- (void)withScriptStateVoid;
- (DOMTestObj *)withScriptStateObj;
- (void)withScriptStateVoidException;
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm (104410 => 104411)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm 2012-01-08 22:48:35 UTC (rev 104411)
@@ -643,24 +643,6 @@
IMPL->removeEventListener(type, WTF::getPtr(nativeEventListener), useCapture);
}
-- (void)withDynamicFrame
-{
- WebCore::JSMainThreadNullState state;
- IMPL->withDynamicFrame();
-}
-
-- (void)withDynamicFrameAndArg:(int)intArg
-{
- WebCore::JSMainThreadNullState state;
- IMPL->withDynamicFrameAndArg(intArg);
-}
-
-- (void)withDynamicFrameAndOptionalArg:(int)intArg optionalArg:(int)optionalArg
-{
- WebCore::JSMainThreadNullState state;
- IMPL->withDynamicFrameAndOptionalArg(intArg, optionalArg);
-}
-
- (void)withScriptStateVoid
{
WebCore::JSMainThreadNullState state;
Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (104410 => 104411)
--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2012-01-08 22:48:35 UTC (rev 104411)
@@ -101,9 +101,6 @@
in [Optional] boolean useCapture);
// 'CallWith' extended attribute
- [CallWith=DynamicFrame] void withDynamicFrame();
- [CallWith=DynamicFrame] void withDynamicFrameAndArg(in long intArg);
- [CallWith=DynamicFrame] void withDynamicFrameAndOptionalArg(in long intArg, in [Optional] long optionalArg);
[CallWith=ScriptState] void withScriptStateVoid();
[CallWith=ScriptState] TestObj withScriptStateObj();
[CallWith=ScriptState] void withScriptStateVoidException()
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (104410 => 104411)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-01-08 21:59:30 UTC (rev 104410)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-01-08 22:48:35 UTC (rev 104411)
@@ -893,53 +893,6 @@
return v8::Undefined();
}
-static v8::Handle<v8::Value> withDynamicFrameCallback(const v8::Arguments& args)
-{
- INC_STATS("DOM.TestObj.withDynamicFrame");
- TestObj* imp = V8TestObj::toNative(args.Holder());
- Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
- if (!enteredFrame)
- return v8::Undefined();
- imp->withDynamicFrame(enteredFrame);
- return v8::Handle<v8::Value>();
-}
-
-static v8::Handle<v8::Value> withDynamicFrameAndArgCallback(const v8::Arguments& args)
-{
- INC_STATS("DOM.TestObj.withDynamicFrameAndArg");
- if (args.Length() < 1)
- return throwError("Not enough arguments", V8Proxy::TypeError);
- TestObj* imp = V8TestObj::toNative(args.Holder());
- EXCEPTION_BLOCK(int, intArg, toInt32(MAYBE_MISSING_PARAMETER(args, 0, MissingIsUndefined)));
- Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
- if (!enteredFrame)
- return v8::Undefined();
- imp->withDynamicFrameAndArg(enteredFrame, intArg);
- return v8::Handle<v8::Value>();
-}
-
-static v8::Handle<v8::Value> withDynamicFrameAndOptionalArgCallback(const v8::Arguments& args)
-{
- INC_STATS("DOM.TestObj.withDynamicFrameAndOptionalArg");
- if (args.Length() < 1)
- return throwError("Not enough arguments", V8Proxy::TypeError);
- TestObj* imp = V8TestObj::toNative(args.Holder());
- EXCEPTION_BLOCK(int, intArg, toInt32(MAYBE_MISSING_PARAMETER(args, 0, MissingIsUndefined)));
- if (args.Length() <= 1) {
- Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
- if (!enteredFrame)
- return v8::Undefined();
- imp->withDynamicFrameAndOptionalArg(enteredFrame, intArg);
- return v8::Handle<v8::Value>();
- }
- EXCEPTION_BLOCK(int, optionalArg, toInt32(MAYBE_MISSING_PARAMETER(args, 1, MissingIsUndefined)));
- Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
- if (!enteredFrame)
- return v8::Undefined();
- imp->withDynamicFrameAndOptionalArg(enteredFrame, intArg, optionalArg);
- return v8::Handle<v8::Value>();
-}
-
static v8::Handle<v8::Value> withScriptStateVoidCallback(const v8::Arguments& args)
{
INC_STATS("DOM.TestObj.withScriptStateVoid");
@@ -1438,9 +1391,6 @@
{"customMethodWithArgs", V8TestObj::customMethodWithArgsCallback},
{"addEventListener", TestObjInternal::addEventListenerCallback},
{"removeEventListener", TestObjInternal::removeEventListenerCallback},
- {"withDynamicFrame", TestObjInternal::withDynamicFrameCallback},
- {"withDynamicFrameAndArg", TestObjInternal::withDynamicFrameAndArgCallback},
- {"withDynamicFrameAndOptionalArg", TestObjInternal::withDynamicFrameAndOptionalArgCallback},
{"withScriptStateVoid", TestObjInternal::withScriptStateVoidCallback},
{"withScriptStateObj", TestObjInternal::withScriptStateObjCallback},
{"withScriptStateVoidException", TestObjInternal::withScriptStateVoidExceptionCallback},
