| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 using WebCore::TypeBuilder::Debugger::FunctionDetails; | 45 using WebCore::TypeBuilder::Debugger::FunctionDetails; |
| 46 using WebCore::TypeBuilder::Runtime::RemoteObject; | 46 using WebCore::TypeBuilder::Runtime::RemoteObject; |
| 47 | 47 |
| 48 namespace WebCore { | 48 namespace WebCore { |
| 49 | 49 |
| 50 InjectedScript::InjectedScript() | 50 InjectedScript::InjectedScript() |
| 51 : InjectedScriptBase("InjectedScript") | 51 : InjectedScriptBase("InjectedScript") |
| 52 { | 52 { |
| 53 } | 53 } |
| 54 | 54 |
| 55 InjectedScript::InjectedScript(ScriptObject injectedScriptObject, InspectedState
AccessCheck accessCheck) | 55 InjectedScript::InjectedScript(ScriptValue injectedScriptObject, InspectedStateA
ccessCheck accessCheck) |
| 56 : InjectedScriptBase("InjectedScript", injectedScriptObject, accessCheck) | 56 : InjectedScriptBase("InjectedScript", injectedScriptObject, accessCheck) |
| 57 { | 57 { |
| 58 } | 58 } |
| 59 | 59 |
| 60 void InjectedScript::evaluate(ErrorString* errorString, const String& expression
, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, boo
l generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuild
er::OptOutput<bool>* wasThrown) | 60 void InjectedScript::evaluate(ErrorString* errorString, const String& expression
, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, boo
l generatePreview, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuild
er::OptOutput<bool>* wasThrown) |
| 61 { | 61 { |
| 62 ScriptFunctionCall function(injectedScriptObject(), "evaluate"); | 62 ScriptFunctionCall function(injectedScriptObject(), "evaluate"); |
| 63 function.appendArgument(expression); | 63 function.appendArgument(expression); |
| 64 function.appendArgument(objectGroup); | 64 function.appendArgument(objectGroup); |
| 65 function.appendArgument(includeCommandLineAPI); | 65 function.appendArgument(includeCommandLineAPI); |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 ASSERT(!hadException); | 332 ASSERT(!hadException); |
| 333 } | 333 } |
| 334 | 334 |
| 335 ScriptValue InjectedScript::nodeAsScriptValue(Node* node) | 335 ScriptValue InjectedScript::nodeAsScriptValue(Node* node) |
| 336 { | 336 { |
| 337 return InjectedScriptHost::nodeAsScriptValue(scriptState(), node); | 337 return InjectedScriptHost::nodeAsScriptValue(scriptState(), node); |
| 338 } | 338 } |
| 339 | 339 |
| 340 } // namespace WebCore | 340 } // namespace WebCore |
| 341 | 341 |
| OLD | NEW |