Diff
Modified: trunk/Source/WebCore/ChangeLog (89266 => 89267)
--- trunk/Source/WebCore/ChangeLog 2011-06-20 18:55:46 UTC (rev 89266)
+++ trunk/Source/WebCore/ChangeLog 2011-06-20 19:04:15 UTC (rev 89267)
@@ -1,3 +1,34 @@
+2011-06-20 Eric Seidel <[email protected]>
+
+ Reviewed by Adam Barth.
+
+ buildbots should run run-bindings-tests
+ https://bugs.webkit.org/show_bug.cgi?id=63001
+
+ The test results were out of date, so I'm updating them.
+ (This is exactly the problem that making the buildbots run them will solve.)
+
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndUserGesture):
+ (WebCore::jsTestObjPrototypeFunctionWithDynamicFrameAndUserGestureASAD):
+ * bindings/scripts/test/V8/V8TestCallback.cpp:
+ (WebCore::V8TestCallback::callbackWithStringList):
+ * bindings/scripts/test/V8/V8TestCallback.h:
+ * bindings/scripts/test/V8/V8TestInterface.cpp:
+ (WebCore::V8TestInterface::GetRawTemplate):
+ (WebCore::V8TestInterface::GetTemplate):
+ * bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp:
+ (WebCore::V8TestMediaQueryListListener::GetRawTemplate):
+ (WebCore::V8TestMediaQueryListListener::GetTemplate):
+ * bindings/scripts/test/V8/V8TestObj.cpp:
+ (WebCore::TestObjInternal::withDynamicFrameAndUserGestureCallback):
+ (WebCore::TestObjInternal::withDynamicFrameAndUserGestureASADCallback):
+ (WebCore::V8TestObj::GetRawTemplate):
+ (WebCore::V8TestObj::GetTemplate):
+ * bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp:
+ (WebCore::V8TestSerializedScriptValueInterface::GetRawTemplate):
+ (WebCore::V8TestSerializedScriptValueInterface::GetTemplate):
+
2011-06-20 Cary Clark <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (89266 => 89267)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2011-06-20 18:55:46 UTC (rev 89266)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2011-06-20 19:04:15 UTC (rev 89267)
@@ -35,6 +35,7 @@
#include "ScriptArguments.h"
#include "ScriptCallStack.h"
#include "ScriptCallStackFactory.h"
+#include "ScriptController.h"
#include "SerializedScriptValue.h"
#include "TestObj.h"
#include <runtime/Error.h>
@@ -1273,7 +1274,7 @@
if (exec->hadException())
return JSValue::encode(jsUndefined());
- imp->withDynamicFrameAndUserGesture(dynamicFrame, intArg, processingUserGesture());
+ imp->withDynamicFrameAndUserGesture(dynamicFrame, intArg, ScriptController::processingUserGesture());
return JSValue::encode(jsUndefined());
}
@@ -1302,7 +1303,7 @@
if (exec->hadException())
return JSValue::encode(jsUndefined());
- imp->withDynamicFrameAndUserGestureASAD(dynamicFrame, intArg, optionalArg, processingUserGesture());
+ imp->withDynamicFrameAndUserGestureASAD(dynamicFrame, intArg, optionalArg, ScriptController::processingUserGesture());
return JSValue::encode(jsUndefined());
}
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCallback.cpp (89266 => 89267)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCallback.cpp 2011-06-20 18:55:46 UTC (rev 89266)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCallback.cpp 2011-06-20 19:04:15 UTC (rev 89267)
@@ -132,7 +132,7 @@
return !invokeCallback(m_callback, 2, argv, callbackReturnValue, scriptExecutionContext());
}
-bool V8TestCallback::callbackWithStringList(PassRefPtr<DOMStringList> listParam)
+bool V8TestCallback::callbackWithStringList(RefPtr<DOMStringList> listParam)
{
if (!canInvokeCallback())
return true;
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCallback.h (89266 => 89267)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCallback.h 2011-06-20 18:55:46 UTC (rev 89266)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestCallback.h 2011-06-20 19:04:15 UTC (rev 89267)
@@ -50,7 +50,7 @@
virtual bool callbackWithClass2Param(Class2* class2Param, const String& strArg);
COMPILE_ASSERT(false) virtual int callbackWithNonBoolReturnType(Class3* class3Param);
virtual int customCallback(Class5* class5Param, Class6* class6Param);
- virtual bool callbackWithStringList(PassRefPtr<DOMStringList> listParam);
+ virtual bool callbackWithStringList(RefPtr<DOMStringList> listParam);
private:
V8TestCallback(v8::Local<v8::Object>, ScriptExecutionContext*);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp (89266 => 89267)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp 2011-06-20 18:55:46 UTC (rev 89266)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp 2011-06-20 19:04:15 UTC (rev 89267)
@@ -62,14 +62,29 @@
v8::Persistent<v8::FunctionTemplate> V8TestInterface::GetRawTemplate()
{
- static v8::Persistent<v8::FunctionTemplate> V8TestInterfaceRawCache = createRawTemplate();
- return V8TestInterfaceRawCache;
+ V8BindingPerIsolateData* data = ""
+ V8BindingPerIsolateData::TemplateMap::iterator result = data->rawTemplateMap().find(&info);
+ if (result != data->rawTemplateMap().end())
+ return result->second;
+
+ v8::HandleScope handleScope;
+ v8::Persistent<v8::FunctionTemplate> templ = createRawTemplate();
+ data->rawTemplateMap().add(&info, templ);
+ return templ;
}
v8::Persistent<v8::FunctionTemplate> V8TestInterface::GetTemplate()
{
- static v8::Persistent<v8::FunctionTemplate> V8TestInterfaceCache = ConfigureV8TestInterfaceTemplate(GetRawTemplate());
- return V8TestInterfaceCache;
+ V8BindingPerIsolateData* data = ""
+ V8BindingPerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
+ if (result != data->templateMap().end())
+ return result->second;
+
+ v8::HandleScope handleScope;
+ v8::Persistent<v8::FunctionTemplate> templ =
+ ConfigureV8TestInterfaceTemplate(GetRawTemplate());
+ data->templateMap().add(&info, templ);
+ return templ;
}
bool V8TestInterface::HasInstance(v8::Handle<v8::Value> value)
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp (89266 => 89267)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp 2011-06-20 18:55:46 UTC (rev 89266)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp 2011-06-20 19:04:15 UTC (rev 89267)
@@ -69,14 +69,29 @@
v8::Persistent<v8::FunctionTemplate> V8TestMediaQueryListListener::GetRawTemplate()
{
- static v8::Persistent<v8::FunctionTemplate> V8TestMediaQueryListListenerRawCache = createRawTemplate();
- return V8TestMediaQueryListListenerRawCache;
+ V8BindingPerIsolateData* data = ""
+ V8BindingPerIsolateData::TemplateMap::iterator result = data->rawTemplateMap().find(&info);
+ if (result != data->rawTemplateMap().end())
+ return result->second;
+
+ v8::HandleScope handleScope;
+ v8::Persistent<v8::FunctionTemplate> templ = createRawTemplate();
+ data->rawTemplateMap().add(&info, templ);
+ return templ;
}
v8::Persistent<v8::FunctionTemplate> V8TestMediaQueryListListener::GetTemplate()
{
- static v8::Persistent<v8::FunctionTemplate> V8TestMediaQueryListListenerCache = ConfigureV8TestMediaQueryListListenerTemplate(GetRawTemplate());
- return V8TestMediaQueryListListenerCache;
+ V8BindingPerIsolateData* data = ""
+ V8BindingPerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
+ if (result != data->templateMap().end())
+ return result->second;
+
+ v8::HandleScope handleScope;
+ v8::Persistent<v8::FunctionTemplate> templ =
+ ConfigureV8TestMediaQueryListListenerTemplate(GetRawTemplate());
+ data->templateMap().add(&info, templ);
+ return templ;
}
bool V8TestMediaQueryListListener::HasInstance(v8::Handle<v8::Value> value)
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (89266 => 89267)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2011-06-20 18:55:46 UTC (rev 89266)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2011-06-20 19:04:15 UTC (rev 89267)
@@ -30,6 +30,7 @@
#include "ScriptArguments.h"
#include "ScriptCallStack.h"
#include "ScriptCallStackFactory.h"
+#include "ScriptController.h"
#include "SerializedScriptValue.h"
#include "V8Binding.h"
#include "V8BindingMacros.h"
@@ -869,7 +870,7 @@
Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
if (!enteredFrame)
return v8::Undefined();
- imp->withDynamicFrameAndUserGesture(enteredFrame, intArg, processingUserGesture());
+ imp->withDynamicFrameAndUserGesture(enteredFrame, intArg, ScriptController::processingUserGesture());
return v8::Handle<v8::Value>();
}
@@ -882,14 +883,14 @@
Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
if (!enteredFrame)
return v8::Undefined();
- imp->withDynamicFrameAndUserGestureASAD(enteredFrame, intArg, processingUserGesture());
+ imp->withDynamicFrameAndUserGestureASAD(enteredFrame, intArg, ScriptController::processingUserGesture());
return v8::Handle<v8::Value>();
}
EXCEPTION_BLOCK(int, optionalArg, toInt32(args[1]));
Frame* enteredFrame = V8Proxy::retrieveFrameForEnteredContext();
if (!enteredFrame)
return v8::Undefined();
- imp->withDynamicFrameAndUserGestureASAD(enteredFrame, intArg, optionalArg, processingUserGesture());
+ imp->withDynamicFrameAndUserGestureASAD(enteredFrame, intArg, optionalArg, ScriptController::processingUserGesture());
return v8::Handle<v8::Value>();
}
@@ -1355,14 +1356,29 @@
v8::Persistent<v8::FunctionTemplate> V8TestObj::GetRawTemplate()
{
- static v8::Persistent<v8::FunctionTemplate> V8TestObjRawCache = createRawTemplate();
- return V8TestObjRawCache;
+ V8BindingPerIsolateData* data = ""
+ V8BindingPerIsolateData::TemplateMap::iterator result = data->rawTemplateMap().find(&info);
+ if (result != data->rawTemplateMap().end())
+ return result->second;
+
+ v8::HandleScope handleScope;
+ v8::Persistent<v8::FunctionTemplate> templ = createRawTemplate();
+ data->rawTemplateMap().add(&info, templ);
+ return templ;
}
v8::Persistent<v8::FunctionTemplate> V8TestObj::GetTemplate()
{
- static v8::Persistent<v8::FunctionTemplate> V8TestObjCache = ConfigureV8TestObjTemplate(GetRawTemplate());
- return V8TestObjCache;
+ V8BindingPerIsolateData* data = ""
+ V8BindingPerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
+ if (result != data->templateMap().end())
+ return result->second;
+
+ v8::HandleScope handleScope;
+ v8::Persistent<v8::FunctionTemplate> templ =
+ ConfigureV8TestObjTemplate(GetRawTemplate());
+ data->templateMap().add(&info, templ);
+ return templ;
}
bool V8TestObj::HasInstance(v8::Handle<v8::Value> value)
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp (89266 => 89267)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp 2011-06-20 18:55:46 UTC (rev 89266)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp 2011-06-20 19:04:15 UTC (rev 89267)
@@ -57,14 +57,29 @@
v8::Persistent<v8::FunctionTemplate> V8TestSerializedScriptValueInterface::GetRawTemplate()
{
- static v8::Persistent<v8::FunctionTemplate> V8TestSerializedScriptValueInterfaceRawCache = createRawTemplate();
- return V8TestSerializedScriptValueInterfaceRawCache;
+ V8BindingPerIsolateData* data = ""
+ V8BindingPerIsolateData::TemplateMap::iterator result = data->rawTemplateMap().find(&info);
+ if (result != data->rawTemplateMap().end())
+ return result->second;
+
+ v8::HandleScope handleScope;
+ v8::Persistent<v8::FunctionTemplate> templ = createRawTemplate();
+ data->rawTemplateMap().add(&info, templ);
+ return templ;
}
v8::Persistent<v8::FunctionTemplate> V8TestSerializedScriptValueInterface::GetTemplate()
{
- static v8::Persistent<v8::FunctionTemplate> V8TestSerializedScriptValueInterfaceCache = ConfigureV8TestSerializedScriptValueInterfaceTemplate(GetRawTemplate());
- return V8TestSerializedScriptValueInterfaceCache;
+ V8BindingPerIsolateData* data = ""
+ V8BindingPerIsolateData::TemplateMap::iterator result = data->templateMap().find(&info);
+ if (result != data->templateMap().end())
+ return result->second;
+
+ v8::HandleScope handleScope;
+ v8::Persistent<v8::FunctionTemplate> templ =
+ ConfigureV8TestSerializedScriptValueInterfaceTemplate(GetRawTemplate());
+ data->templateMap().add(&info, templ);
+ return templ;
}
bool V8TestSerializedScriptValueInterface::HasInstance(v8::Handle<v8::Value> value)
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (89266 => 89267)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-06-20 18:55:46 UTC (rev 89266)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-06-20 19:04:15 UTC (rev 89267)
@@ -329,6 +329,13 @@
command = ["perl", "./Tools/Scripts/test-webkitperl"]
+class RunBindingsTests(shell.Test):
+ name = "bindings-generation-tests"
+ description = ["bindings-tests running"]
+ descriptionDone = ["bindings-tests"]
+ command = ["python", "./Tools/Scripts/run-bindings-tests"]
+
+
class RunGtkAPITests(shell.Test):
name = "API tests"
description = ["API tests running"]
@@ -531,11 +538,10 @@
# FIXME: Only running in debug mode due to https://bugs.webkit.org/show_bug.cgi?id=61812
if configuration == "debug":
self.addStep(RunUnitTests)
- # Tiger's Python 2.3 is too old. WebKit Python requires 2.5+.
- # Sadly we have no way to detect the version on the slave from here.
- if platform != "mac-tiger":
- self.addStep(RunPythonTests)
+
+ self.addStep(RunPythonTests)
self.addStep(RunPerlTests)
+ self.addStep(RunBindingsTests)
self.addStep(ArchiveTestResults)
self.addStep(UploadTestResults)
self.addStep(self.ExtractTestResultsClass)
@@ -556,16 +562,12 @@
# FIXME: Only running in debug mode due to https://bugs.webkit.org/show_bug.cgi?id=61812
if configuration == "debug":
self.addStep(RunUnitTests)
- # Tiger's Python 2.3 is too old. WebKit Python requires 2.5+.
- # Sadly we have no way to detect the version on the slave from here.
+ self.addStep(RunPythonTests)
# Chromium Win runs in non-Cygwin environment, which is not yet fit
# for running tests. This can be removed once bug 48166 is fixed.
- if platform != "mac-tiger":
- self.addStep(RunPythonTests)
- # Chromium Win runs in non-Cygwin environment, which is not yet fit
- # for running tests. This can be removed once bug 48166 is fixed.
if platform != "chromium-win":
self.addStep(RunPerlTests)
+ self.addStep(RunBindingsTests)
self.addStep(ArchiveTestResults)
self.addStep(UploadTestResults)
self.addStep(self.ExtractTestResultsClass)
Modified: trunk/Tools/ChangeLog (89266 => 89267)
--- trunk/Tools/ChangeLog 2011-06-20 18:55:46 UTC (rev 89266)
+++ trunk/Tools/ChangeLog 2011-06-20 19:04:15 UTC (rev 89267)
@@ -1,3 +1,18 @@
+2011-06-20 Eric Seidel <[email protected]>
+
+ Reviewed by Adam Barth.
+
+ buildbots should run run-bindings-tests
+ https://bugs.webkit.org/show_bug.cgi?id=63001
+
+ run-bindings-tests takes 2.4 seconds on my machine, so
+ I expect this will not be noticeable on the bots.
+
+ I also removed tiger-specific checks since Tiger is no
+ longer a supported platform for webkit.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+
2011-06-20 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix WebKit2 GTK build after r89249.
