summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/v8
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-06-08 21:48:45 +0100
committerSteve Block <steveblock@google.com>2010-06-08 23:42:31 +0100
commit5ba37cdd56eb2f0f2ca83581858c2d82be5aed1e (patch)
tree0af77b7d839819db9e8c1b69df94f87f7e49242d /WebCore/bindings/v8
parent65e1daa0f8c3d169ec216f3bb1d2d460a395abbd (diff)
downloadexternal_webkit-5ba37cdd56eb2f0f2ca83581858c2d82be5aed1e.zip
external_webkit-5ba37cdd56eb2f0f2ca83581858c2d82be5aed1e.tar.gz
external_webkit-5ba37cdd56eb2f0f2ca83581858c2d82be5aed1e.tar.bz2
Remove a temporary Android-specific hack added to avoid a problem with ScriptDebugServer::topStackFrame()
Change https://android-git.corp.google.com/g/50673 introduced a temporary fix to avoid calling ScriptDebugServer::topStackFrame(). This was required while WebKit Bug https://bugs.webkit.org/show_bug.cgi?id=37502 was being fixed. The fix for this bug was committed in WebKit r60083 so we can now remove the hack. See also https://bugs.webkit.org/show_bug.cgi?id=38531 Change-Id: I1e26e71637faeec5c5806b7792a89a7fa63737d3
Diffstat (limited to 'WebCore/bindings/v8')
-rw-r--r--WebCore/bindings/v8/ScriptCallStack.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/WebCore/bindings/v8/ScriptCallStack.cpp b/WebCore/bindings/v8/ScriptCallStack.cpp
index c0b1780..31b05ee 100644
--- a/WebCore/bindings/v8/ScriptCallStack.cpp
+++ b/WebCore/bindings/v8/ScriptCallStack.cpp
@@ -52,9 +52,6 @@ ScriptCallStack* ScriptCallStack::create(const v8::Arguments& arguments, unsigne
bool ScriptCallStack::callLocation(String* sourceName, int* sourceLineNumber, String* functionName)
{
-#if PLATFORM(ANDROID)
- return false;
-#else
v8::HandleScope scope;
v8::Context::Scope contextScope(v8::Context::GetCurrent());
v8::Handle<v8::StackTrace> stackTrace(v8::StackTrace::CurrentStackTrace(1));
@@ -77,7 +74,6 @@ bool ScriptCallStack::callLocation(String* sourceName, int* sourceLineNumber, St
*functionName = functionNameValue.IsEmpty() ? "" : toWebCoreString(functionNameValue);
*sourceLineNumber = frame->GetLineNumber();
return true;
-#endif
}
ScriptCallStack::ScriptCallStack(const v8::Arguments& arguments, unsigned skipArgumentCount, String sourceName, int sourceLineNumber, String functionName)