diff options
Diffstat (limited to 'WebCore/bridge/c/c_utility.cpp')
| -rw-r--r-- | WebCore/bridge/c/c_utility.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebCore/bridge/c/c_utility.cpp b/WebCore/bridge/c/c_utility.cpp index e786896..ea970eb 100644 --- a/WebCore/bridge/c/c_utility.cpp +++ b/WebCore/bridge/c/c_utility.cpp @@ -94,9 +94,15 @@ void convertValueToNPVariant(ExecState* exec, JSValue value, NPVariant* result) OBJECT_TO_NPVARIANT(obj, *result); } } else { +#ifdef ANDROID + RootObject* rootObject = findRootObject(exec->dynamicGlobalObject()); + if (!rootObject) + rootObject = findRootObject(exec->lexicalGlobalObject()); +#else JSGlobalObject* globalObject = exec->dynamicGlobalObject(); RootObject* rootObject = findRootObject(globalObject); +#endif if (rootObject) { NPObject* npObject = _NPN_CreateScriptObject(0, object, rootObject); OBJECT_TO_NPVARIANT(npObject, *result); |