| 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 15 matching lines...) Expand all Loading... |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 | 33 |
| 34 #include "core/inspector/InjectedScriptBase.h" | 34 #include "core/inspector/InjectedScriptBase.h" |
| 35 | 35 |
| 36 #include "bindings/v8/ScriptFunctionCall.h" | 36 #include "bindings/core/v8/ScriptFunctionCall.h" |
| 37 #include "core/inspector/InspectorInstrumentation.h" | 37 #include "core/inspector/InspectorInstrumentation.h" |
| 38 #include "core/inspector/InspectorTraceEvents.h" | 38 #include "core/inspector/InspectorTraceEvents.h" |
| 39 #include "platform/JSONValues.h" | 39 #include "platform/JSONValues.h" |
| 40 #include "wtf/text/WTFString.h" | 40 #include "wtf/text/WTFString.h" |
| 41 | 41 |
| 42 using WebCore::TypeBuilder::Runtime::RemoteObject; | 42 using WebCore::TypeBuilder::Runtime::RemoteObject; |
| 43 | 43 |
| 44 namespace WebCore { | 44 namespace WebCore { |
| 45 | 45 |
| 46 InjectedScriptBase::InjectedScriptBase(const String& name) | 46 InjectedScriptBase::InjectedScriptBase(const String& name) |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 if (!resultObj || !resultPair->getBoolean("wasThrown", &wasThrownVal)) { | 144 if (!resultObj || !resultPair->getBoolean("wasThrown", &wasThrownVal)) { |
| 145 *errorString = "Internal error: result is not a pair of value and wasThr
own flag"; | 145 *errorString = "Internal error: result is not a pair of value and wasThr
own flag"; |
| 146 return; | 146 return; |
| 147 } | 147 } |
| 148 *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj); | 148 *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj); |
| 149 *wasThrown = wasThrownVal; | 149 *wasThrown = wasThrownVal; |
| 150 } | 150 } |
| 151 | 151 |
| 152 } // namespace WebCore | 152 } // namespace WebCore |
| 153 | 153 |
| OLD | NEW |