| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 23 matching lines...) Expand all Loading... |
| 34 #include "bindings/v8/ScriptScope.h" | 34 #include "bindings/v8/ScriptScope.h" |
| 35 #include "bindings/v8/ScriptState.h" | 35 #include "bindings/v8/ScriptState.h" |
| 36 | 36 |
| 37 #include "V8InspectorFrontendHost.h" | 37 #include "V8InspectorFrontendHost.h" |
| 38 | 38 |
| 39 #include <v8.h> | 39 #include <v8.h> |
| 40 | 40 |
| 41 namespace WebCore { | 41 namespace WebCore { |
| 42 | 42 |
| 43 ScriptObject::ScriptObject(ScriptState* scriptState, v8::Handle<v8::Object> v8Ob
ject) | 43 ScriptObject::ScriptObject(ScriptState* scriptState, v8::Handle<v8::Object> v8Ob
ject) |
| 44 : ScriptValue(v8Object) | 44 : ScriptValue(v8Object, scriptState->isolate()) |
| 45 , m_scriptState(scriptState) | 45 , m_scriptState(scriptState) |
| 46 { | 46 { |
| 47 } | 47 } |
| 48 | 48 |
| 49 ScriptObject::ScriptObject(ScriptState* scriptState, const ScriptValue& scriptVa
lue) | 49 ScriptObject::ScriptObject(ScriptState* scriptState, const ScriptValue& scriptVa
lue) |
| 50 : ScriptValue(scriptValue) | 50 : ScriptValue(scriptValue) |
| 51 , m_scriptState(scriptState) | 51 , m_scriptState(scriptState) |
| 52 { | 52 { |
| 53 } | 53 } |
| 54 | 54 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 73 return false; | 73 return false; |
| 74 | 74 |
| 75 if (!v8Value->IsObject()) | 75 if (!v8Value->IsObject()) |
| 76 return false; | 76 return false; |
| 77 | 77 |
| 78 value = ScriptObject(scriptState, v8::Handle<v8::Object>::Cast(v8Value)); | 78 value = ScriptObject(scriptState, v8::Handle<v8::Object>::Cast(v8Value)); |
| 79 return true; | 79 return true; |
| 80 } | 80 } |
| 81 | 81 |
| 82 } // namespace WebCore | 82 } // namespace WebCore |
| OLD | NEW |