diff options
| author | Steve Block <steveblock@google.com> | 2011-06-02 16:17:03 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-02 16:33:30 +0100 |
| commit | 2d44f555f1b58dea94258c21592a95e78fe5bc21 (patch) | |
| tree | f2b48ade449557c8315569788ab5ed0094c497fa /Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp | |
| parent | 6ea85f710d3202b52ed43e19dad04aaa014dda94 (diff) | |
| download | external_webkit-2d44f555f1b58dea94258c21592a95e78fe5bc21.zip external_webkit-2d44f555f1b58dea94258c21592a95e78fe5bc21.tar.gz external_webkit-2d44f555f1b58dea94258c21592a95e78fe5bc21.tar.bz2 | |
Remove Android guard EMULATE_JSC_BINDINGS
This flag is always set to true and will not be upstreamed, so should
be removed, along with code for the 'else' case.
Also clean up Android modifications to minimise diff and add guards.
Change-Id: I7d3b7bab2fef772bffdf3a402cc318dbea5f5865
Diffstat (limited to 'Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp')
| -rw-r--r-- | Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp b/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp index da6cf4a..0d7c3fb 100644 --- a/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp +++ b/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp @@ -156,7 +156,7 @@ bool JavaNPObjectGetProperty(NPObject* obj, NPIdentifier identifier, NPVariant* if (!field) return false; -#ifdef EMULATE_JSC_BINDINGS +#if PLATFORM(ANDROID) // JSC does not seem to support returning object properties so we emulate that // behaviour here. jvalue value; @@ -168,7 +168,7 @@ bool JavaNPObjectGetProperty(NPObject* obj, NPIdentifier identifier, NPVariant* field->getJNIType(), field->name().utf8(), field->type()); -#endif +#endif // PLATFORM(ANDROID) convertJValueToNPVariant(value, field->getJNIType(), field->type(), result); return true; |