diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 11:50:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-21 12:01:46 +0100 |
| commit | 25f6136652d8341ed047e7fc1a450af5bd218ea9 (patch) | |
| tree | 1aaefdeb728884cf07eccd51130ba7438611ce6d /samples | |
| parent | 388eba4e819805cb37ffe18231f53c79102356ae (diff) | |
| download | android_external_v8-25f6136652d8341ed047e7fc1a450af5bd218ea9.tar.gz android_external_v8-25f6136652d8341ed047e7fc1a450af5bd218ea9.tar.bz2 android_external_v8-25f6136652d8341ed047e7fc1a450af5bd218ea9.zip | |
Merge WebKit at r59636: Update v8 to r4660.
Will build and run with current webkit.
Change-Id: I57bae621fd894da363ba84e1757ad09eb7c502b9
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/process.cc | 2 | ||||
| -rw-r--r-- | samples/shell.cc | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/samples/process.cc b/samples/process.cc index 511e21a0..9233c0df 100644 --- a/samples/process.cc +++ b/samples/process.cc @@ -294,7 +294,7 @@ Handle<Object> JsHttpRequestProcessor::WrapMap(map<string, string>* obj) { // Fetch the template for creating JavaScript map wrappers. // It only has to be created once, which we do on demand. - if (request_template_.IsEmpty()) { + if (map_template_.IsEmpty()) { Handle<ObjectTemplate> raw_template = MakeMapTemplate(); map_template_ = Persistent<ObjectTemplate>::New(raw_template); } diff --git a/samples/shell.cc b/samples/shell.cc index 27ed293e..1a13f5f8 100644 --- a/samples/shell.cc +++ b/samples/shell.cc @@ -299,5 +299,10 @@ void ReportException(v8::TryCatch* try_catch) { printf("^"); } printf("\n"); + v8::String::Utf8Value stack_trace(try_catch->StackTrace()); + if (stack_trace.length() > 0) { + const char* stack_trace_string = ToCString(stack_trace); + printf("%s\n", stack_trace_string); + } } } |