aboutsummaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-11-30 16:04:58 +0000
committerBen Murdoch <benm@google.com>2011-12-02 17:28:30 +0000
commit589d6979ff2ef66fca2d8fa51404c369ca5e9250 (patch)
tree1d9032fcae9d18a05430a4ba9c14e5c635c4096e /samples
parent69a99ed0b2b2ef69d393c371b03db3a98aaf880e (diff)
downloadv8-589d6979ff2ef66fca2d8fa51404c369ca5e9250.tar.gz
Upgrade to V8 3.6
Merge V8 at 3.6.6.11 Simple merge required updates to makefiles only. Bug: 5688872 Change-Id: Ib38b7ffbcd409585f6cb6fccc59c767029cecc77
Diffstat (limited to 'samples')
-rw-r--r--samples/process.cc2
-rw-r--r--samples/shell.cc6
2 files changed, 2 insertions, 6 deletions
diff --git a/samples/process.cc b/samples/process.cc
index 07c48057..c0cee4c2 100644
--- a/samples/process.cc
+++ b/samples/process.cc
@@ -77,7 +77,6 @@ class HttpRequestProcessor {
*/
class JsHttpRequestProcessor : public HttpRequestProcessor {
public:
-
// Creates a new processor that processes requests by invoking the
// Process function of the JavaScript script given as an argument.
explicit JsHttpRequestProcessor(Handle<String> script) : script_(script) { }
@@ -88,7 +87,6 @@ class JsHttpRequestProcessor : public HttpRequestProcessor {
virtual bool Process(HttpRequest* req);
private:
-
// Execute the script associated with this processor and extract the
// Process function. Returns true if this succeeded, otherwise false.
bool ExecuteScript(Handle<String> script);
diff --git a/samples/shell.cc b/samples/shell.cc
index 8ed9d032..b40eca2f 100644
--- a/samples/shell.cc
+++ b/samples/shell.cc
@@ -250,16 +250,14 @@ void RunShell(v8::Handle<v8::Context> context) {
static const int kBufferSize = 256;
// Enter the execution environment before evaluating any code.
v8::Context::Scope context_scope(context);
+ v8::Local<v8::String> name(v8::String::New("(shell)"));
while (true) {
char buffer[kBufferSize];
printf("> ");
char* str = fgets(buffer, kBufferSize, stdin);
if (str == NULL) break;
v8::HandleScope handle_scope;
- ExecuteString(v8::String::New(str),
- v8::String::New("(shell)"),
- true,
- true);
+ ExecuteString(v8::String::New(str), name, true, true);
}
printf("\n");
}