Diff
Modified: trunk/Source/WebCore/ChangeLog (104409 => 104410)
--- trunk/Source/WebCore/ChangeLog 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/ChangeLog 2012-01-08 21:59:30 UTC (rev 104410)
@@ -1,5 +1,22 @@
2012-01-08 Adam Barth <[email protected]>
+ NeedsUserGestureCheck IDL attribute is no longer used
+ https://bugs.webkit.org/show_bug.cgi?id=75794
+
+ Reviewed by Eric Seidel.
+
+ This IDL attribute is no longer used because we use static state to
+ keep track of the user gesture state. We can delete the code that
+ supports it.
+
+ * bindings/scripts/CodeGeneratorCPP.pm:
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ * bindings/scripts/CodeGeneratorV8.pm:
+ * bindings/scripts/test/TestObj.idl:
+
+2012-01-08 Adam Barth <[email protected]>
+
Remove unused security functions from V8 bindings
https://bugs.webkit.org/show_bug.cgi?id=75797
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorCPP.pm 2012-01-08 21:59:30 UTC (rev 104410)
@@ -201,7 +201,6 @@
return 1 if $typeInfo->signature->extendedAttributes->{"CustomArgumentHandling"}
or $typeInfo->signature->extendedAttributes->{"CustomGetter"}
- or $typeInfo->signature->extendedAttributes->{"NeedsUserGestureCheck"}
or $typeInfo->signature->extendedAttributes->{"CPPCustom"};
# FIXME: We don't generate bindings for SVG related interfaces yet
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2012-01-08 21:59:30 UTC (rev 104410)
@@ -769,14 +769,6 @@
push(@callImplParams, $paramName);
}
- # Not quite sure what to do with this yet, but we need to take into
- # account the difference in parameters between the IDL file and the
- # actual implementation.
- if ($function->signature->extendedAttributes->{"NeedsUserGestureCheck"}) {
- $functionSig .= ", gboolean isUserGesture";
- push(@callImplParams, "false");
- }
-
if ($returnType ne "void" && $returnValueIsGDOMType && $functionSigType ne "DOMObject") {
if ($functionSigType ne "EventTarget") {
$implIncludes{"webkit/WebKitDOM${functionSigType}Private.h"} = 1;
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2012-01-08 21:59:30 UTC (rev 104410)
@@ -2572,13 +2572,6 @@
$paramIndex++;
}
- if ($function->signature->extendedAttributes->{"NeedsUserGestureCheck"}) {
- $functionString .= ", " if $paramIndex;
- $functionString .= "ScriptController::processingUserGesture()";
- $paramIndex++;
- $implIncludes{"ScriptController.h"} = 1;
- }
-
return ($functionString, $paramIndex);
}
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-01-08 21:59:30 UTC (rev 104410)
@@ -3247,13 +3247,6 @@
$index += 2;
}
- if ($function->signature->extendedAttributes->{"NeedsUserGestureCheck"}) {
- $functionString .= ", " if $index;
- $functionString .= "ScriptController::processingUserGesture()";
- $index++;
- AddToImplIncludes("ScriptController.h");
- }
-
if (@{$function->raisesExceptions}) {
$functionString .= ", " if $index;
$functionString .= "ec";
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h 2012-01-08 21:59:30 UTC (rev 104410)
@@ -166,8 +166,6 @@
void withDynamicFrame();
void withDynamicFrameAndArg(int intArg);
void withDynamicFrameAndOptionalArg(int intArg, int optionalArg);
- void withDynamicFrameAndUserGesture(int intArg);
- void withDynamicFrameAndUserGestureASAD(int intArg, int optionalArg);
void withScriptStateVoid();
WebDOMTestObj withScriptStateObj();
void withScriptStateVoidException();
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp 2012-01-08 21:59:30 UTC (rev 104410)
@@ -257,24 +257,6 @@
}
void
-webkit_dom_test_obj_with_dynamic_frame_and_user_gesture(WebKitDOMTestObj* self, glong int_arg, gboolean isUserGesture)
-{
- g_return_if_fail(self);
- WebCore::JSMainThreadNullState state;
- WebCore::TestObj * item = WebKit::core(self);
- item->withDynamicFrameAndUserGesture(int_arg, false);
-}
-
-void
-webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad(WebKitDOMTestObj* self, glong int_arg, glong optional_arg, gboolean isUserGesture)
-{
- g_return_if_fail(self);
- WebCore::JSMainThreadNullState state;
- WebCore::TestObj * item = WebKit::core(self);
- item->withDynamicFrameAndUserGestureASAD(int_arg, optional_arg, false);
-}
-
-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 (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h 2012-01-08 21:59:30 UTC (rev 104410)
@@ -207,29 +207,6 @@
webkit_dom_test_obj_with_dynamic_frame_and_optional_arg(WebKitDOMTestObj* self, glong int_arg, glong optional_arg);
/**
- * webkit_dom_test_obj_with_dynamic_frame_and_user_gesture:
- * @self: A #WebKitDOMTestObj
- * @int_arg: A #glong
- *
- * Returns:
- *
-**/
-WEBKIT_API void
-webkit_dom_test_obj_with_dynamic_frame_and_user_gesture(WebKitDOMTestObj* self, glong int_arg, gboolean isUserGesture);
-
-/**
- * webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad:
- * @self: A #WebKitDOMTestObj
- * @int_arg: A #glong
- * @optional_arg: A #glong
- *
- * Returns:
- *
-**/
-WEBKIT_API void
-webkit_dom_test_obj_with_dynamic_frame_and_user_gesture_asad(WebKitDOMTestObj* self, glong int_arg, glong optional_arg, gboolean isUserGesture);
-
-/**
* webkit_dom_test_obj_with_script_state_void:
* @self: A #WebKitDOMTestObj
*
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2012-01-08 21:59:30 UTC (rev 104410)
@@ -36,7 +36,6 @@
#include "ScriptArguments.h"
#include "ScriptCallStack.h"
#include "ScriptCallStackFactory.h"
-#include "ScriptController.h"
#include "SerializedScriptValue.h"
#include "TestObj.h"
#include <runtime/Error.h>
@@ -245,8 +244,6 @@
{ "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 },
- { "withDynamicFrameAndUserGesture", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionWithDynamicFrameAndUserGesture), (intptr_t)1, NoIntrinsic },
- { "withDynamicFrameAndUserGestureASAD", DontDelete | JSC::Function, (intptr_t)static_cast<NativeFunction>(jsTestObjPrototypeFunctionWithDynamicFrameAndUserGestureASAD), (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 },
@@ -271,7 +268,7 @@
{ 0, 0, 0, 0, NoIntrinsic }
};
-static const HashTable JSTestObjPrototypeTable = { 137, 127, JSTestObjPrototypeTableValues, 0 };
+static const HashTable JSTestObjPrototypeTable = { 136, 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)
@@ -1374,56 +1371,6 @@
return JSValue::encode(jsUndefined());
}
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithDynamicFrameAndUserGesture(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->withDynamicFrameAndUserGesture(dynamicFrame, intArg, ScriptController::processingUserGesture());
- return JSValue::encode(jsUndefined());
-}
-
-EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithDynamicFrameAndUserGestureASAD(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->withDynamicFrameAndUserGestureASAD(dynamicFrame, intArg);
- return JSValue::encode(jsUndefined());
- }
-
- int optionalArg(MAYBE_MISSING_PARAMETER(exec, 1, MissingIsUndefined).toInt32(exec));
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
- impl->withDynamicFrameAndUserGestureASAD(dynamicFrame, intArg, optionalArg, ScriptController::processingUserGesture());
- 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 (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2012-01-08 21:59:30 UTC (rev 104410)
@@ -169,8 +169,6 @@
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 jsTestObjPrototypeFunctionWithDynamicFrameAndUserGesture(JSC::ExecState*);
-JSC::EncodedJSValue JSC_HOST_CALL jsTestObjPrototypeFunctionWithDynamicFrameAndUserGestureASAD(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 (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.h 2012-01-08 21:59:30 UTC (rev 104410)
@@ -158,8 +158,6 @@
- (void)withDynamicFrame;
- (void)withDynamicFrameAndArg:(int)intArg;
- (void)withDynamicFrameAndOptionalArg:(int)intArg optionalArg:(int)optionalArg;
-- (void)withDynamicFrameAndUserGesture:(int)intArg;
-- (void)withDynamicFrameAndUserGestureASAD:(int)intArg optionalArg:(int)optionalArg;
- (void)withScriptStateVoid;
- (DOMTestObj *)withScriptStateObj;
- (void)withScriptStateVoidException;
Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm 2012-01-08 21:59:30 UTC (rev 104410)
@@ -661,18 +661,6 @@
IMPL->withDynamicFrameAndOptionalArg(intArg, optionalArg);
}
-- (void)withDynamicFrameAndUserGesture:(int)intArg
-{
- WebCore::JSMainThreadNullState state;
- IMPL->withDynamicFrameAndUserGesture(intArg);
-}
-
-- (void)withDynamicFrameAndUserGestureASAD:(int)intArg optionalArg:(int)optionalArg
-{
- WebCore::JSMainThreadNullState state;
- IMPL->withDynamicFrameAndUserGestureASAD(intArg, optionalArg);
-}
-
- (void)withScriptStateVoid
{
WebCore::JSMainThreadNullState state;
Modified: trunk/Source/WebCore/bindings/scripts/test/TestObj.idl (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/test/TestObj.idl 2012-01-08 21:59:30 UTC (rev 104410)
@@ -104,8 +104,6 @@
[CallWith=DynamicFrame] void withDynamicFrame();
[CallWith=DynamicFrame] void withDynamicFrameAndArg(in long intArg);
[CallWith=DynamicFrame] void withDynamicFrameAndOptionalArg(in long intArg, in [Optional] long optionalArg);
- [NeedsUserGestureCheck, CallWith=DynamicFrame] void withDynamicFrameAndUserGesture(in long intArg);
- [NeedsUserGestureCheck, CallWith=DynamicFrame] void withDynamicFrameAndUserGestureASAD(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 (104409 => 104410)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-01-08 21:44:52 UTC (rev 104409)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-01-08 21:59:30 UTC (rev 104410)
@@ -30,7 +30,6 @@
#include "ScriptArguments.h"
#include "ScriptCallStack.h"
#include "ScriptCallStackFactory.h"
-#include "ScriptController.h"
#include "SerializedScriptValue.h"
#include "V8Binding.h"
#include "V8BindingMacros.h"
@@ -941,42 +940,6 @@
return v8::Handle<v8::Value>();
}
-static v8::Handle<v8::Value> withDynamicFrameAndUserGestureCallback(const v8::Arguments& args)
-{
- INC_STATS("DOM.TestObj.withDynamicFrameAndUserGesture");
- 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->withDynamicFrameAndUserGesture(enteredFrame, intArg, ScriptController::processingUserGesture());
- return v8::Handle<v8::Value>();
-}
-
-static v8::Handle<v8::Value> withDynamicFrameAndUserGestureASADCallback(const v8::Arguments& args)
-{
- INC_STATS("DOM.TestObj.withDynamicFrameAndUserGestureASAD");
- 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->withDynamicFrameAndUserGestureASAD(enteredFrame, intArg, ScriptController::processingUserGesture());
- 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->withDynamicFrameAndUserGestureASAD(enteredFrame, intArg, optionalArg, ScriptController::processingUserGesture());
- return v8::Handle<v8::Value>();
-}
-
static v8::Handle<v8::Value> withScriptStateVoidCallback(const v8::Arguments& args)
{
INC_STATS("DOM.TestObj.withScriptStateVoid");
@@ -1478,8 +1441,6 @@
{"withDynamicFrame", TestObjInternal::withDynamicFrameCallback},
{"withDynamicFrameAndArg", TestObjInternal::withDynamicFrameAndArgCallback},
{"withDynamicFrameAndOptionalArg", TestObjInternal::withDynamicFrameAndOptionalArgCallback},
- {"withDynamicFrameAndUserGesture", TestObjInternal::withDynamicFrameAndUserGestureCallback},
- {"withDynamicFrameAndUserGestureASAD", TestObjInternal::withDynamicFrameAndUserGestureASADCallback},
{"withScriptStateVoid", TestObjInternal::withScriptStateVoidCallback},
{"withScriptStateObj", TestObjInternal::withScriptStateObjCallback},
{"withScriptStateVoidException", TestObjInternal::withScriptStateVoidExceptionCallback},
