diff options
| author | Steve Block <steveblock@google.com> | 2010-05-10 13:28:21 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:14 +0100 |
| commit | 0cfd31de936072a6e5a8c23853485006ca7ae36b (patch) | |
| tree | 9bd941a8b20c706a65704c8ca6e4253830ede7c9 /WebCore | |
| parent | a7969e1aef2f2fddbfae2026d34c959e8b07e23b (diff) | |
| download | external_webkit-0cfd31de936072a6e5a8c23853485006ca7ae36b.zip external_webkit-0cfd31de936072a6e5a8c23853485006ca7ae36b.tar.gz external_webkit-0cfd31de936072a6e5a8c23853485006ca7ae36b.tar.bz2 | |
Merge webkit.org at r58033 : Remove call to ScriptDebugServer::topStackFrame() on Android
ScriptDebugServer is guarded with (JAVASCRIPT_DEBUGGER), which is not defined on
Android. An attempt was made in https://bugs.webkit.org/show_bug.cgi?id=38531 to
move ScriptDebugServer::topStackFrame() to ScriptCallStack to avoid the linker
error. However, this causes crashes on Android as our version of the V8 snapshot
is not consistent with this.
This fix is a temporary work-around to avoid the problem by simply not calling
ScriptDebugServer::topStackFrame(). The problem will be fixed properly upstream
when this code is refactored, as described in the WebKit bug.
Change-Id: I3952eed2e56dbb5a6f6204276bd499e79bba2227
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bindings/v8/ScriptCallStack.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/bindings/v8/ScriptCallStack.cpp b/WebCore/bindings/v8/ScriptCallStack.cpp index 45e7205..95e874b 100644 --- a/WebCore/bindings/v8/ScriptCallStack.cpp +++ b/WebCore/bindings/v8/ScriptCallStack.cpp @@ -51,10 +51,14 @@ ScriptCallStack* ScriptCallStack::create(const v8::Arguments& arguments, unsigne bool ScriptCallStack::callLocation(String* sourceName, int* sourceLineNumber, String* functionName) { +#if PLATFORM(ANDROID) + return false; +#else if (!ScriptDebugServer::topStackFrame(*sourceName, *sourceLineNumber, *functionName)) return false; *sourceLineNumber += 1; return true; +#endif } ScriptCallStack::ScriptCallStack(const v8::Arguments& arguments, unsigned skipArgumentCount, String sourceName, int sourceLineNumber, String functionName) |