diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-18 12:11:34 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-18 12:11:34 +0100 |
| commit | bd95bdca9bf72d861ac7a21ae977299b57ab1e69 (patch) | |
| tree | af4db94f8c2ce341259c2c0fd3c33072b9df724a /WebCore | |
| parent | e0330ac957b8434cd2c9c7b5447aaa0faabe77ec (diff) | |
| download | external_webkit-bd95bdca9bf72d861ac7a21ae977299b57ab1e69.zip external_webkit-bd95bdca9bf72d861ac7a21ae977299b57ab1e69.tar.gz external_webkit-bd95bdca9bf72d861ac7a21ae977299b57ab1e69.tar.bz2 | |
Try to fix JNI startup errors.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bindings/v8/ScriptController.cpp | 2 | ||||
| -rw-r--r-- | WebCore/bindings/v8/V8Index.cpp | 5 | ||||
| -rw-r--r-- | WebCore/bindings/v8/V8Utilities.h | 3 |
3 files changed, 7 insertions, 3 deletions
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 |