summaryrefslogtreecommitdiffstats
path: root/WebCore/bindings/v8/ScriptCallStack.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-06-11 02:25:15 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-06-11 02:25:15 -0700
commit4c25ba384d3aa8f11847f54213de8bf22f78ed09 (patch)
tree3e5c318c738986f99e1355eda24bd64227464aab /WebCore/bindings/v8/ScriptCallStack.cpp
parenta959a8f85742ffa810fd49d39e9fd91f23ce1610 (diff)
parent5ba37cdd56eb2f0f2ca83581858c2d82be5aed1e (diff)
downloadexternal_webkit-4c25ba384d3aa8f11847f54213de8bf22f78ed09.zip
external_webkit-4c25ba384d3aa8f11847f54213de8bf22f78ed09.tar.gz
external_webkit-4c25ba384d3aa8f11847f54213de8bf22f78ed09.tar.bz2
Merge "Remove a temporary Android-specific hack added to avoid a problem with ScriptDebugServer::topStackFrame()"
Diffstat (limited to 'WebCore/bindings/v8/ScriptCallStack.cpp')
-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)