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 "HTMLNames.h" | |
35 #include "bindings/v8/ScriptObject.h" | 34 #include "bindings/v8/ScriptObject.h" |
36 #include "bindings/v8/ScriptProfiler.h" | 35 #include "bindings/v8/ScriptProfiler.h" |
37 #include "core/html/HTMLCanvasElement.h" | 36 #include "core/html/HTMLCanvasElement.h" |
38 #include "core/inspector/BindingVisitors.h" | 37 #include "core/inspector/BindingVisitors.h" |
39 #include "core/inspector/InjectedScript.h" | 38 #include "core/inspector/InjectedScript.h" |
40 #include "core/inspector/InjectedScriptCanvasModule.h" | 39 #include "core/inspector/InjectedScriptCanvasModule.h" |
41 #include "core/inspector/InjectedScriptManager.h" | 40 #include "core/inspector/InjectedScriptManager.h" |
42 #include "core/inspector/InspectorPageAgent.h" | 41 #include "core/inspector/InspectorPageAgent.h" |
43 #include "core/inspector/InspectorState.h" | 42 #include "core/inspector/InspectorState.h" |
44 #include "core/inspector/InstrumentingAgents.h" | 43 #include "core/inspector/InstrumentingAgents.h" |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 class NodeVisitor FINAL : public WrappedNodeVisitor { | 262 class NodeVisitor FINAL : public WrappedNodeVisitor { |
264 public: | 263 public: |
265 NodeVisitor(Page* page, FramesWithUninstrumentedCanvases& result) | 264 NodeVisitor(Page* page, FramesWithUninstrumentedCanvases& result) |
266 : m_page(page) | 265 : m_page(page) |
267 , m_framesWithUninstrumentedCanvases(result) | 266 , m_framesWithUninstrumentedCanvases(result) |
268 { | 267 { |
269 } | 268 } |
270 | 269 |
271 virtual void visitNode(Node* node) OVERRIDE | 270 virtual void visitNode(Node* node) OVERRIDE |
272 { | 271 { |
273 if (!node->hasTagName(HTMLNames::canvasTag) || !node->document().fra
me()) | 272 ASSERT(node); |
| 273 if (!isHTMLCanvasElement(*node) || !node->document().frame()) |
274 return; | 274 return; |
275 | 275 |
276 LocalFrame* frame = node->document().frame(); | 276 LocalFrame* frame = node->document().frame(); |
277 if (frame->page() != m_page) | 277 if (frame->page() != m_page) |
278 return; | 278 return; |
279 | 279 |
280 if (toHTMLCanvasElement(node)->renderingContext()) | 280 if (toHTMLCanvasElement(node)->renderingContext()) |
281 m_framesWithUninstrumentedCanvases.set(frame, true); | 281 m_framesWithUninstrumentedCanvases.set(frame, true); |
282 } | 282 } |
283 | 283 |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
341 ErrorString error; | 341 ErrorString error; |
342 for (FramesWithUninstrumentedCanvases::const_iterator it = m_framesWithUnins
trumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it)
{ | 342 for (FramesWithUninstrumentedCanvases::const_iterator it = m_framesWithUnins
trumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it)
{ |
343 InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, m
ainWorldScriptState(it->key)); | 343 InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, m
ainWorldScriptState(it->key)); |
344 if (!module.hasNoValue()) | 344 if (!module.hasNoValue()) |
345 module.markFrameEnd(); | 345 module.markFrameEnd(); |
346 } | 346 } |
347 } | 347 } |
348 | 348 |
349 } // namespace WebCore | 349 } // namespace WebCore |
350 | 350 |
OLD | NEW |