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 29 matching lines...) Expand all Loading... |
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/loader/DocumentLoader.h" | 47 #include "core/loader/DocumentLoader.h" |
48 #include "core/page/DOMWindow.h" | 48 #include "core/page/DOMWindow.h" |
49 #include "core/page/Frame.h" | 49 #include "core/page/Frame.h" |
50 #include "core/page/Page.h" | |
51 | 50 |
52 using WebCore::TypeBuilder::Array; | 51 using WebCore::TypeBuilder::Array; |
53 using WebCore::TypeBuilder::Canvas::ResourceId; | 52 using WebCore::TypeBuilder::Canvas::ResourceId; |
54 using WebCore::TypeBuilder::Canvas::ResourceInfo; | 53 using WebCore::TypeBuilder::Canvas::ResourceInfo; |
55 using WebCore::TypeBuilder::Canvas::ResourceState; | 54 using WebCore::TypeBuilder::Canvas::ResourceState; |
56 using WebCore::TypeBuilder::Canvas::TraceLog; | 55 using WebCore::TypeBuilder::Canvas::TraceLog; |
57 using WebCore::TypeBuilder::Canvas::TraceLogId; | 56 using WebCore::TypeBuilder::Canvas::TraceLogId; |
58 using WebCore::TypeBuilder::Network::FrameId; | 57 using WebCore::TypeBuilder::Network::FrameId; |
59 | 58 |
60 namespace WebCore { | 59 namespace WebCore { |
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
341 ErrorString error; | 340 ErrorString error; |
342 for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumen
tedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) { | 341 for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumen
tedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) { |
343 InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, m
ainWorldScriptState(it->key)); | 342 InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, m
ainWorldScriptState(it->key)); |
344 if (!module.hasNoValue()) | 343 if (!module.hasNoValue()) |
345 module.markFrameEnd(); | 344 module.markFrameEnd(); |
346 } | 345 } |
347 } | 346 } |
348 | 347 |
349 } // namespace WebCore | 348 } // namespace WebCore |
350 | 349 |
OLD | NEW |