| 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/InspectorCanvasAgent.h" | 32 #include "core/inspector/InspectorCanvasAgent.h" |
| 33 | 33 |
| 34 #include "HTMLCanvasElement.h" | |
| 35 #include "HTMLNames.h" | 34 #include "HTMLNames.h" |
| 36 #include "InspectorFrontend.h" | 35 #include "InspectorFrontend.h" |
| 37 #include "bindings/v8/ScriptObject.h" | 36 #include "bindings/v8/ScriptObject.h" |
| 38 #include "bindings/v8/ScriptProfiler.h" | 37 #include "bindings/v8/ScriptProfiler.h" |
| 39 #include "bindings/v8/ScriptState.h" | 38 #include "bindings/v8/ScriptState.h" |
| 39 #include "core/html/HTMLCanvasElement.h" |
| 40 #include "core/inspector/BindingVisitors.h" | 40 #include "core/inspector/BindingVisitors.h" |
| 41 #include "core/inspector/InjectedScript.h" | 41 #include "core/inspector/InjectedScript.h" |
| 42 #include "core/inspector/InjectedScriptCanvasModule.h" | 42 #include "core/inspector/InjectedScriptCanvasModule.h" |
| 43 #include "core/inspector/InjectedScriptManager.h" | 43 #include "core/inspector/InjectedScriptManager.h" |
| 44 #include "core/inspector/InspectorPageAgent.h" | 44 #include "core/inspector/InspectorPageAgent.h" |
| 45 #include "core/inspector/InspectorState.h" | 45 #include "core/inspector/InspectorState.h" |
| 46 #include "core/inspector/InstrumentingAgents.h" | 46 #include "core/inspector/InstrumentingAgents.h" |
| 47 #include "core/page/DOMWindow.h" | 47 #include "core/page/DOMWindow.h" |
| 48 #include "core/page/Frame.h" | 48 #include "core/page/Frame.h" |
| 49 #include "core/page/Page.h" | 49 #include "core/page/Page.h" |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 ErrorString error; | 337 ErrorString error; |
| 338 for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumen
tedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) { | 338 for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumen
tedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) { |
| 339 InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, m
ainWorldScriptState(it->key)); | 339 InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, m
ainWorldScriptState(it->key)); |
| 340 if (!module.hasNoValue()) | 340 if (!module.hasNoValue()) |
| 341 module.markFrameEnd(); | 341 module.markFrameEnd(); |
| 342 } | 342 } |
| 343 } | 343 } |
| 344 | 344 |
| 345 } // namespace WebCore | 345 } // namespace WebCore |
| 346 | 346 |
| OLD | NEW |