summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings
diff options
context:
space:
mode:
authorLeon Clarke <leonclarke@google.com>2010-06-08 16:06:53 +0100
committerLeon Clarke <leonclarke@google.com>2010-06-08 16:06:53 +0100
commit65e1daa0f8c3d169ec216f3bb1d2d460a395abbd (patch)
treee198cf1ea9cdd7895c597dc39f8fabe1a596875d /WebCore/bindings
parent1c65de00d27cc78a09c3ec6f7d17ff3edad5a9c8 (diff)
downloadexternal_webkit-65e1daa0f8c3d169ec216f3bb1d2d460a395abbd.zip
external_webkit-65e1daa0f8c3d169ec216f3bb1d2d460a395abbd.tar.gz
external_webkit-65e1daa0f8c3d169ec216f3bb1d2d460a395abbd.tar.bz2
Merge webkit.org at r60469 : Fix JSC build break
Custom bindings signatures have changed in JSC following this change http://trac.webkit.org/changeset/60392 so isApplicationInstalled (which isn't upstreamed) needs to be updated to match the new style. Change-Id: I7e837d61cdc7d4e5a4cd294c11e6ad4d827d5a2a
Diffstat (limited to 'WebCore/bindings')
-rw-r--r--WebCore/bindings/js/JSNavigatorCustom.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/WebCore/bindings/js/JSNavigatorCustom.cpp b/WebCore/bindings/js/JSNavigatorCustom.cpp
index e33fd78..a190b60 100644
--- a/WebCore/bindings/js/JSNavigatorCustom.cpp
+++ b/WebCore/bindings/js/JSNavigatorCustom.cpp
@@ -46,22 +46,22 @@ void JSNavigator::markChildren(MarkStack& markStack)
#if PLATFORM(ANDROID) && ENABLE(APPLICATION_INSTALLED)
-JSC::JSValue WebCore::JSNavigator::isApplicationInstalled(JSC::ExecState* exec, JSC::ArgList const& args)
+JSC::JSValue WebCore::JSNavigator::isApplicationInstalled(JSC::ExecState* exec)
{
- if (args.size() < 2) {
+ if (exec->argumentCount() < 2) {
setDOMException(exec, SYNTAX_ERR);
return jsUndefined();
}
- if (!args.at(1).inherits(&InternalFunction::info)) {
+ if (!exec->argument(1).inherits(&InternalFunction::info)) {
setDOMException(exec, TYPE_MISMATCH_ERR);
return jsUndefined();
}
- String appName = ustringToString(args.at(0).toString(exec));
+ String appName = ustringToString(exec->argument(0).toString(exec));
JSObject* object;
- if (!(object = args.at(1).getObject())) {
+ if (!(object = exec->argument(1).getObject())) {
setDOMException(exec, TYPE_MISMATCH_ERR);
return jsUndefined();
}