| 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 28 matching lines...) Expand all Loading... |
| 39 #include "core/html/HTMLCanvasElement.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" | |
| 50 | 49 |
| 51 using WebCore::TypeBuilder::Array; | 50 using WebCore::TypeBuilder::Array; |
| 52 using WebCore::TypeBuilder::Canvas::ResourceId; | 51 using WebCore::TypeBuilder::Canvas::ResourceId; |
| 53 using WebCore::TypeBuilder::Canvas::ResourceInfo; | 52 using WebCore::TypeBuilder::Canvas::ResourceInfo; |
| 54 using WebCore::TypeBuilder::Canvas::ResourceState; | 53 using WebCore::TypeBuilder::Canvas::ResourceState; |
| 55 using WebCore::TypeBuilder::Canvas::TraceLog; | 54 using WebCore::TypeBuilder::Canvas::TraceLog; |
| 56 using WebCore::TypeBuilder::Canvas::TraceLogId; | 55 using WebCore::TypeBuilder::Canvas::TraceLogId; |
| 57 using WebCore::TypeBuilder::Network::FrameId; | 56 using WebCore::TypeBuilder::Network::FrameId; |
| 58 | 57 |
| 59 namespace WebCore { | 58 namespace WebCore { |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 ErrorString error; | 336 ErrorString error; |
| 338 for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumen
tedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) { | 337 for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumen
tedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) { |
| 339 InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, m
ainWorldScriptState(it->key)); | 338 InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, m
ainWorldScriptState(it->key)); |
| 340 if (!module.hasNoValue()) | 339 if (!module.hasNoValue()) |
| 341 module.markFrameEnd(); | 340 module.markFrameEnd(); |
| 342 } | 341 } |
| 343 } | 342 } |
| 344 | 343 |
| 345 } // namespace WebCore | 344 } // namespace WebCore |
| 346 | 345 |
| OLD | NEW |