Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(449)

Side by Side Diff: Source/bindings/v8/custom/V8InjectedScriptHostCustom.cpp

Issue 23892012: Pass isolate to v8::Null() function when possible (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/bindings/v8/V8PerIsolateData.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007-2011 Google Inc. All rights reserved. 2 * Copyright (C) 2007-2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 return V8Node::toNative(v8::Handle<v8::Object>::Cast(value.v8Value())); 69 return V8Node::toNative(v8::Handle<v8::Object>::Cast(value.v8Value()));
70 } 70 }
71 71
72 ScriptValue InjectedScriptHost::nodeAsScriptValue(ScriptState* state, Node* node ) 72 ScriptValue InjectedScriptHost::nodeAsScriptValue(ScriptState* state, Node* node )
73 { 73 {
74 v8::HandleScope scope(state->isolate()); 74 v8::HandleScope scope(state->isolate());
75 v8::Local<v8::Context> context = state->context(); 75 v8::Local<v8::Context> context = state->context();
76 v8::Context::Scope contextScope(context); 76 v8::Context::Scope contextScope(context);
77 77
78 if (!BindingSecurity::shouldAllowAccessToNode(node)) 78 if (!BindingSecurity::shouldAllowAccessToNode(node))
79 return ScriptValue(v8::Null()); 79 return ScriptValue(v8::Null(state->isolate()));
80 return ScriptValue(toV8(node, v8::Handle<v8::Object>(), state->isolate())); 80 return ScriptValue(toV8(node, v8::Handle<v8::Object>(), state->isolate()));
81 } 81 }
82 82
83 void V8InjectedScriptHost::inspectedObjectMethodCustom(const v8::FunctionCallbac kInfo<v8::Value>& args) 83 void V8InjectedScriptHost::inspectedObjectMethodCustom(const v8::FunctionCallbac kInfo<v8::Value>& args)
84 { 84 {
85 if (args.Length() < 1) 85 if (args.Length() < 1)
86 return; 86 return;
87 87
88 if (!args[0]->IsInt32()) { 88 if (!args[0]->IsInt32()) {
89 throwTypeError("argument has to be an integer", args.GetIsolate()); 89 throwTypeError("argument has to be an integer", args.GetIsolate());
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 int lineNumber; 427 int lineNumber;
428 int columnNumber; 428 int columnNumber;
429 if (!getFunctionLocation(args, &scriptId, &lineNumber, &columnNumber)) 429 if (!getFunctionLocation(args, &scriptId, &lineNumber, &columnNumber))
430 return; 430 return;
431 431
432 InjectedScriptHost* host = V8InjectedScriptHost::toNative(args.Holder()); 432 InjectedScriptHost* host = V8InjectedScriptHost::toNative(args.Holder());
433 host->unmonitorFunction(scriptId, lineNumber, columnNumber); 433 host->unmonitorFunction(scriptId, lineNumber, columnNumber);
434 } 434 }
435 435
436 } // namespace WebCore 436 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/V8PerIsolateData.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698