Diff
Modified: trunk/Source/WebCore/ChangeLog (111847 => 111848)
--- trunk/Source/WebCore/ChangeLog 2012-03-23 11:14:13 UTC (rev 111847)
+++ trunk/Source/WebCore/ChangeLog 2012-03-23 12:02:11 UTC (rev 111848)
@@ -1,3 +1,22 @@
+2012-03-23 Kentaro Hara <[email protected]>
+
+ Unreviewed, rebaselined run-bindings-tests results.
+
+ * bindings/scripts/test/CPP/WebDOMTestObj.cpp:
+ * bindings/scripts/test/CPP/WebDOMTestObj.h:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::jsTestObjPrototypeFunctionMethodWithCallbackArg):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg):
+ (WebCore::jsTestObjPrototypeFunctionMethodWithCallbackAndOptionalArg):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod5):
+ (WebCore::jsTestObjPrototypeFunctionOverloadedMethod):
+ * bindings/scripts/test/V8/V8TestObj.cpp:
+ (WebCore::TestObjInternal::methodWithCallbackArgCallback):
+ (WebCore::TestObjInternal::methodWithNonCallbackArgAndCallbackArgCallback):
+ (WebCore::TestObjInternal::methodWithCallbackAndOptionalArgCallback):
+ (WebCore::TestObjInternal::overloadedMethod5Callback):
+ (WebCore::TestObjInternal::overloadedMethodCallback):
+
2012-03-23 Ryosuke Niwa <[email protected]>
cssText should use StringBuilder
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp (111847 => 111848)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp 2012-03-23 11:14:13 UTC (rev 111847)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.cpp 2012-03-23 12:02:11 UTC (rev 111848)
@@ -41,7 +41,6 @@
#include "WebDOMd.h"
#include "WebDOMe.h"
#include "WebDOMsequence.h"
-#include "WebDOMsequence<ScriptProfile>.h"
#include "WebExceptionHandler.h"
#include "WebNativeEventListener.h"
#include "a.h"
@@ -51,7 +50,6 @@
#include "d.h"
#include "e.h"
#include "sequence.h"
-#include "sequence<ScriptProfile>.h"
#include "wtf/text/AtomicString.h"
#include <wtf/GetPtr.h>
#include <wtf/RefPtr.h>
@@ -237,22 +235,6 @@
impl()->setTestObjAttr(toWebCore(newTestObjAttr));
}
-WebDOMsequence<ScriptProfile> WebDOMTestObj::sequenceAttr() const
-{
- if (!impl())
- return WebDOMsequence<ScriptProfile>();
-
- return toWebKit(WTF::getPtr(impl()->sequenceAttr()));
-}
-
-void WebDOMTestObj::setSequenceAttr(const WebDOMsequence<ScriptProfile>& newSequenceAttr)
-{
- if (!impl())
- return;
-
- impl()->setSequenceAttr(toWebCore(newSequenceAttr));
-}
-
WebDOMTestObj WebDOMTestObj::XMLObjAttr() const
{
if (!impl())
@@ -705,14 +687,6 @@
impl()->methodWithSequenceArg(toWebCore());
}
-WebDOMsequence<ScriptProfile> WebDOMTestObj::methodReturningSequence(int intArg)
-{
- if (!impl())
- return WebDOMsequence<ScriptProfile>();
-
- return toWebKit(WTF::getPtr(impl()->methodReturningSequence(intArg)));
-}
-
WebDOMTestObj WebDOMTestObj::methodThatRequiresAllArgsAndThrows(const WebDOMString& strArg, const WebDOMTestObj& objArg)
{
if (!impl())
Modified: trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h (111847 => 111848)
--- trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h 2012-03-23 11:14:13 UTC (rev 111847)
+++ trunk/Source/WebCore/bindings/scripts/test/CPP/WebDOMTestObj.h 2012-03-23 12:02:11 UTC (rev 111848)
@@ -44,7 +44,6 @@
class WebDOMd;
class WebDOMe;
class WebDOMsequence;
-class WebDOMsequence<ScriptProfile>;
class WebDOMTestObj : public WebDOMObject {
public:
@@ -89,8 +88,6 @@
void setStringAttr(const WebDOMString&);
WebDOMTestObj testObjAttr() const;
void setTestObjAttr(const WebDOMTestObj&);
- WebDOMsequence<ScriptProfile> sequenceAttr() const;
- void setSequenceAttr(const WebDOMsequence<ScriptProfile>&);
WebDOMTestObj XMLObjAttr() const;
void setXMLObjAttr(const WebDOMTestObj&);
bool create() const;
@@ -152,7 +149,6 @@
WebDOMTestObj objMethod();
WebDOMTestObj objMethodWithArgs(int intArg, const WebDOMString& strArg, const WebDOMTestObj& objArg);
void methodWithSequenceArg(const WebDOMsequence& );
- WebDOMsequence<ScriptProfile> methodReturningSequence(int intArg);
WebDOMTestObj methodThatRequiresAllArgsAndThrows(const WebDOMString& strArg, const WebDOMTestObj& objArg);
void serializedValue(const WebDOMString& serializedArg);
void idbKey(const WebDOMIDBKey& key);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (111847 => 111848)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2012-03-23 11:14:13 UTC (rev 111847)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2012-03-23 12:02:11 UTC (rev 111848)
@@ -1866,7 +1866,7 @@
TestObj* impl = static_cast<TestObj*>(castedThis->impl());
if (exec->argumentCount() < 1)
return throwVMError(exec, createTypeError(exec, "Not enough arguments"));
- if (exec->argumentCount() <= 0 || !exec->argument(0).isObject()) {
+ if (exec->argumentCount() <= 0 || !exec->argument(0).isFunction()) {
setDOMException(exec, TYPE_MISMATCH_ERR);
return JSValue::encode(jsUndefined());
}
@@ -1888,7 +1888,7 @@
int nonCallback(MAYBE_MISSING_PARAMETER(exec, 0, DefaultIsUndefined).toInt32(exec));
if (exec->hadException())
return JSValue::encode(jsUndefined());
- if (exec->argumentCount() <= 1 || !exec->argument(1).isObject()) {
+ if (exec->argumentCount() <= 1 || !exec->argument(1).isFunction()) {
setDOMException(exec, TYPE_MISMATCH_ERR);
return JSValue::encode(jsUndefined());
}
@@ -1907,7 +1907,7 @@
TestObj* impl = static_cast<TestObj*>(castedThis->impl());
RefPtr<TestCallback> callback;
if (exec->argumentCount() > 0 && !exec->argument(0).isUndefinedOrNull()) {
- if (!exec->argument(0).isObject()) {
+ if (!exec->argument(0).isFunction()) {
setDOMException(exec, TYPE_MISMATCH_ERR);
return JSValue::encode(jsUndefined());
}
@@ -2054,7 +2054,7 @@
TestObj* impl = static_cast<TestObj*>(castedThis->impl());
if (exec->argumentCount() < 1)
return throwVMError(exec, createTypeError(exec, "Not enough arguments"));
- if (exec->argumentCount() <= 0 || !exec->argument(0).isObject()) {
+ if (exec->argumentCount() <= 0 || !exec->argument(0).isFunction()) {
setDOMException(exec, TYPE_MISMATCH_ERR);
return JSValue::encode(jsUndefined());
}
@@ -2110,7 +2110,7 @@
return jsTestObjPrototypeFunctionOverloadedMethod3(exec);
if (argsCount == 1)
return jsTestObjPrototypeFunctionOverloadedMethod4(exec);
- if ((argsCount == 1 && (arg0.isNull() || arg0.isObject())))
+ if ((argsCount == 1 && (arg0.isNull() || arg0.isFunction())))
return jsTestObjPrototypeFunctionOverloadedMethod5(exec);
if ((argsCount == 1 && (arg0.isNull() || (arg0.isObject() && asObject(arg0)->inherits(&JSDOMStringList::s_info)))))
return jsTestObjPrototypeFunctionOverloadedMethod6(exec);
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (111847 => 111848)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-03-23 11:14:13 UTC (rev 111847)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-03-23 12:02:11 UTC (rev 111848)
@@ -1404,7 +1404,7 @@
if (args.Length() < 1)
return throwError("Not enough arguments", V8Proxy::TypeError);
TestObj* imp = V8TestObj::toNative(args.Holder());
- if (args.Length() <= 0 || !args[0]->IsObject())
+ if (args.Length() <= 0 || !args[0]->IsFunction())
return throwError(TYPE_MISMATCH_ERR);
RefPtr<TestCallback> callback = V8TestCallback::create(args[0], getScriptExecutionContext());
imp->methodWithCallbackArg(callback);
@@ -1418,7 +1418,7 @@
return throwError("Not enough arguments", V8Proxy::TypeError);
TestObj* imp = V8TestObj::toNative(args.Holder());
EXCEPTION_BLOCK(int, nonCallback, toInt32(MAYBE_MISSING_PARAMETER(args, 0, DefaultIsUndefined)));
- if (args.Length() <= 1 || !args[1]->IsObject())
+ if (args.Length() <= 1 || !args[1]->IsFunction())
return throwError(TYPE_MISMATCH_ERR);
RefPtr<TestCallback> callback = V8TestCallback::create(args[1], getScriptExecutionContext());
imp->methodWithNonCallbackArgAndCallbackArg(nonCallback, callback);
@@ -1431,7 +1431,7 @@
TestObj* imp = V8TestObj::toNative(args.Holder());
RefPtr<TestCallback> callback;
if (args.Length() > 0 && !args[0]->IsNull() && !args[0]->IsUndefined()) {
- if (!args[0]->IsObject())
+ if (!args[0]->IsFunction())
return throwError(TYPE_MISMATCH_ERR);
callback = V8TestCallback::create(args[0], getScriptExecutionContext());
}
@@ -1530,7 +1530,7 @@
if (args.Length() < 1)
return throwError("Not enough arguments", V8Proxy::TypeError);
TestObj* imp = V8TestObj::toNative(args.Holder());
- if (args.Length() <= 0 || !args[0]->IsObject())
+ if (args.Length() <= 0 || !args[0]->IsFunction())
return throwError(TYPE_MISMATCH_ERR);
RefPtr<TestCallback> callback = V8TestCallback::create(args[0], getScriptExecutionContext());
imp->overloadedMethod(callback);
@@ -1570,7 +1570,7 @@
return overloadedMethod3Callback(args);
if (args.Length() == 1)
return overloadedMethod4Callback(args);
- if ((args.Length() == 1 && (args[0]->IsNull() || args[0]->IsObject())))
+ if ((args.Length() == 1 && (args[0]->IsNull() || args[0]->IsFunction())))
return overloadedMethod5Callback(args);
if ((args.Length() == 1 && (args[0]->IsNull() || V8DOMStringList::HasInstance(args[0]))))
return overloadedMethod6Callback(args);
