summaryrefslogtreecommitdiff
path: root/chromium/gin/shell_runner.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-06-18 14:10:49 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-06-18 13:53:24 +0000
commit813fbf95af77a531c57a8c497345ad2c61d475b3 (patch)
tree821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/gin/shell_runner.cc
parentaf6588f8d723931a298c995fa97259bb7f7deb55 (diff)
downloadqtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/gin/shell_runner.cc')
-rw-r--r--chromium/gin/shell_runner.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/chromium/gin/shell_runner.cc b/chromium/gin/shell_runner.cc
index 8d98e425d74..eccee9f69ca 100644
--- a/chromium/gin/shell_runner.cc
+++ b/chromium/gin/shell_runner.cc
@@ -25,10 +25,10 @@ ShellRunnerDelegate::ShellRunnerDelegate() {
ShellRunnerDelegate::~ShellRunnerDelegate() {
}
-v8::Handle<ObjectTemplate> ShellRunnerDelegate::GetGlobalTemplate(
+v8::Local<ObjectTemplate> ShellRunnerDelegate::GetGlobalTemplate(
ShellRunner* runner,
v8::Isolate* isolate) {
- return v8::Handle<ObjectTemplate>();
+ return v8::Local<ObjectTemplate>();
}
void ShellRunnerDelegate::DidCreateContext(ShellRunner* runner) {
@@ -49,7 +49,7 @@ ShellRunner::ShellRunner(ShellRunnerDelegate* delegate, Isolate* isolate)
: delegate_(delegate) {
v8::Isolate::Scope isolate_scope(isolate);
HandleScope handle_scope(isolate);
- v8::Handle<v8::Context> context =
+ v8::Local<v8::Context> context =
Context::New(isolate, NULL, delegate_->GetGlobalTemplate(this, isolate));
context_holder_.reset(new ContextHolder(isolate));
@@ -67,7 +67,7 @@ void ShellRunner::Run(const std::string& source,
const std::string& resource_name) {
TryCatch try_catch;
v8::Isolate* isolate = GetContextHolder()->isolate();
- v8::Handle<Script> script = Script::Compile(
+ v8::Local<Script> script = Script::Compile(
StringToV8(isolate, source), StringToV8(isolate, resource_name));
if (try_catch.HasCaught()) {
delegate_->UnhandledException(this, try_catch);
@@ -77,14 +77,14 @@ void ShellRunner::Run(const std::string& source,
Run(script);
}
-v8::Handle<v8::Value> ShellRunner::Call(v8::Handle<v8::Function> function,
- v8::Handle<v8::Value> receiver,
+v8::Local<v8::Value> ShellRunner::Call(v8::Local<v8::Function> function,
+ v8::Local<v8::Value> receiver,
int argc,
- v8::Handle<v8::Value> argv[]) {
+ v8::Local<v8::Value> argv[]) {
TryCatch try_catch;
delegate_->WillRunScript(this);
- v8::Handle<v8::Value> result = function->Call(receiver, argc, argv);
+ v8::Local<v8::Value> result = function->Call(receiver, argc, argv);
delegate_->DidRunScript(this);
if (try_catch.HasCaught())
@@ -97,7 +97,7 @@ ContextHolder* ShellRunner::GetContextHolder() {
return context_holder_.get();
}
-void ShellRunner::Run(v8::Handle<Script> script) {
+void ShellRunner::Run(v8::Local<Script> script) {
TryCatch try_catch;
delegate_->WillRunScript(this);