From bd95bdca9bf72d861ac7a21ae977299b57ab1e69 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 18 Aug 2009 12:11:34 +0100 Subject: Try to fix JNI startup errors. --- WebCore/bindings/v8/ScriptController.cpp | 2 +- WebCore/bindings/v8/V8Index.cpp | 5 ++++- WebCore/bindings/v8/V8Utilities.h | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'WebCore/bindings') diff --git a/WebCore/bindings/v8/ScriptController.cpp b/WebCore/bindings/v8/ScriptController.cpp index 3c99c61..86533f4 100644 --- a/WebCore/bindings/v8/ScriptController.cpp +++ b/WebCore/bindings/v8/ScriptController.cpp @@ -270,7 +270,7 @@ void ScriptController::collectGarbage() if (v8Context.IsEmpty()) return; - v8::Context::Scope scope(context); + v8::Context::Scope scope(v8Context); #if PLATFORM(ANDROID) v8::V8::CollectAllGarbage(); #else diff --git a/WebCore/bindings/v8/V8Index.cpp b/WebCore/bindings/v8/V8Index.cpp index 8f32256..9efbc3d 100644 --- a/WebCore/bindings/v8/V8Index.cpp +++ b/WebCore/bindings/v8/V8Index.cpp @@ -138,7 +138,6 @@ #include "V8HTMLTitleElement.h" #include "V8HTMLUListElement.h" #include "V8ImageData.h" -#include "V8InspectorBackend.h" #include "V8Media.h" #include "V8MediaList.h" #include "V8MessageChannel.h" @@ -198,6 +197,10 @@ #include "V8RGBColor.h" #include "V8VoidCallback.h" +#if !PLATFORM(ANDROID) +#include "V8InspectorBackend.h" +#endif + #if ENABLE(OFFLINE_WEB_APPLICATIONS) #include "V8DOMApplicationCache.h" #endif diff --git a/WebCore/bindings/v8/V8Utilities.h b/WebCore/bindings/v8/V8Utilities.h index 8bd310b..3e59d34 100644 --- a/WebCore/bindings/v8/V8Utilities.h +++ b/WebCore/bindings/v8/V8Utilities.h @@ -32,7 +32,8 @@ #define V8Utilities_h #if ENABLE(V8_LOCKERS) -#define LOCK_V8 v8::Locker lock +// TODO(benm): Need to re-add in locking for V8. We lost some of the lock points during the merge. Define it to void here so we don't lock some of the time. +#define LOCK_V8 ((void) 0) #else #define LOCK_V8 ((void) 0) #endif -- cgit v1.1