OLD | NEW |
---|---|
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
56 #include "core/inspector/InjectedScript.h" | 56 #include "core/inspector/InjectedScript.h" |
57 #include "core/inspector/InjectedScriptHost.h" | 57 #include "core/inspector/InjectedScriptHost.h" |
58 #include "core/inspector/InspectorDOMAgent.h" | 58 #include "core/inspector/InspectorDOMAgent.h" |
59 #include "core/platform/JSONValues.h" | 59 #include "core/platform/JSONValues.h" |
60 #include "modules/webdatabase/Database.h" | 60 #include "modules/webdatabase/Database.h" |
61 | 61 |
62 namespace WebCore { | 62 namespace WebCore { |
63 | 63 |
64 Node* InjectedScriptHost::scriptValueAsNode(ScriptValue value) | 64 Node* InjectedScriptHost::scriptValueAsNode(ScriptValue value) |
65 { | 65 { |
66 v8::HandleScope scope(v8::Isolate::GetCurrent()); | 66 v8::HandleScope scope(value.isolate()); |
marja
2013/09/18 12:36:28
What's this? I don't see ScriptValue::Isolate... d
marja
2013/09/18 12:37:45
Ahh, you just landed ScriptValue::m_isolate. Hmm,
do-not-use
2013/09/18 12:39:49
Good question. At least no one complained yet :)
I
| |
67 if (!value.isObject() || value.isNull()) | 67 if (!value.isObject() || value.isNull()) |
68 return 0; | 68 return 0; |
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::Isolate* isolate = state->isolate(); | 74 v8::Isolate* isolate = state->isolate(); |
75 v8::HandleScope scope(isolate); | 75 v8::HandleScope scope(isolate); |
76 v8::Local<v8::Context> context = state->context(); | 76 v8::Local<v8::Context> context = state->context(); |
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
428 int lineNumber; | 428 int lineNumber; |
429 int columnNumber; | 429 int columnNumber; |
430 if (!getFunctionLocation(args, &scriptId, &lineNumber, &columnNumber)) | 430 if (!getFunctionLocation(args, &scriptId, &lineNumber, &columnNumber)) |
431 return; | 431 return; |
432 | 432 |
433 InjectedScriptHost* host = V8InjectedScriptHost::toNative(args.Holder()); | 433 InjectedScriptHost* host = V8InjectedScriptHost::toNative(args.Holder()); |
434 host->unmonitorFunction(scriptId, lineNumber, columnNumber); | 434 host->unmonitorFunction(scriptId, lineNumber, columnNumber); |
435 } | 435 } |
436 | 436 |
437 } // namespace WebCore | 437 } // namespace WebCore |
OLD | NEW |