| 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 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 #include "core/inspector/InjectedScriptCanvasModule.h" | 32 #include "core/inspector/InjectedScriptCanvasModule.h" |
| 33 | 33 |
| 34 #include "InjectedScriptCanvasModuleSource.h" | |
| 35 #include "bindings/v8/ScriptFunctionCall.h" | 34 #include "bindings/v8/ScriptFunctionCall.h" |
| 36 #include "bindings/v8/ScriptValue.h" | 35 #include "bindings/v8/ScriptValue.h" |
| 36 #include "core/InjectedScriptCanvasModuleSource.h" |
| 37 | 37 |
| 38 using WebCore::TypeBuilder::Array; | 38 using WebCore::TypeBuilder::Array; |
| 39 using WebCore::TypeBuilder::Canvas::ResourceId; | 39 using WebCore::TypeBuilder::Canvas::ResourceId; |
| 40 using WebCore::TypeBuilder::Canvas::ResourceState; | 40 using WebCore::TypeBuilder::Canvas::ResourceState; |
| 41 using WebCore::TypeBuilder::Canvas::TraceLog; | 41 using WebCore::TypeBuilder::Canvas::TraceLog; |
| 42 using WebCore::TypeBuilder::Canvas::TraceLogId; | 42 using WebCore::TypeBuilder::Canvas::TraceLogId; |
| 43 using WebCore::TypeBuilder::Runtime::RemoteObject; | 43 using WebCore::TypeBuilder::Runtime::RemoteObject; |
| 44 | 44 |
| 45 namespace WebCore { | 45 namespace WebCore { |
| 46 | 46 |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 if (remoteObject) | 207 if (remoteObject) |
| 208 *result = RemoteObject::runtimeCast(remoteObject); | 208 *result = RemoteObject::runtimeCast(remoteObject); |
| 209 RefPtr<JSONObject> resourceStateObject = resultObject->getObject("resourceSt
ate"); | 209 RefPtr<JSONObject> resourceStateObject = resultObject->getObject("resourceSt
ate"); |
| 210 if (resourceStateObject) | 210 if (resourceStateObject) |
| 211 *resourceState = ResourceState::runtimeCast(resourceStateObject); | 211 *resourceState = ResourceState::runtimeCast(resourceStateObject); |
| 212 if (!remoteObject && !resourceStateObject) | 212 if (!remoteObject && !resourceStateObject) |
| 213 *errorString = "Internal error: no result and no resource state"; | 213 *errorString = "Internal error: no result and no resource state"; |
| 214 } | 214 } |
| 215 | 215 |
| 216 } // namespace WebCore | 216 } // namespace WebCore |
| OLD | NEW |