Changeset 218376 in webkit
- Timestamp:
- Jun 15, 2017 7:55:37 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 9 added
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r218371 r218376 1 2017-06-15 Matt Baker <mattbaker@apple.com> 2 3 Web Inspector: Instrument 2D/WebGL canvas contexts in the backend 4 https://bugs.webkit.org/show_bug.cgi?id=172623 5 <rdar://problem/32415986> 6 7 Reviewed by Devin Rousso. 8 9 Test that CanvasAgent dispatches events for canvas lifecycle events. 10 11 * inspector/canvas/create-canvas-contexts-expected.txt: Added. 12 * inspector/canvas/create-canvas-contexts.html: Added. 13 1 14 2017-06-15 Myles C. Maxfield <mmaxfield@apple.com> 2 15 -
trunk/Source/JavaScriptCore/CMakeLists.txt
r218272 r218376 1351 1351 ${JAVASCRIPTCORE_DIR}/inspector/protocol/ApplicationCache.json 1352 1352 ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json 1353 ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json 1353 1354 ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json 1354 1355 ${JAVASCRIPTCORE_DIR}/inspector/protocol/DOM.json -
trunk/Source/JavaScriptCore/ChangeLog
r218350 r218376 1 2017-06-15 Matt Baker <mattbaker@apple.com> 2 3 Web Inspector: Instrument 2D/WebGL canvas contexts in the backend 4 https://bugs.webkit.org/show_bug.cgi?id=172623 5 <rdar://problem/32415986> 6 7 Reviewed by Devin Rousso. 8 9 This patch adds a basic Canvas protocol. It includes Canvas and related 10 types and events for monitoring the lifetime of canvases in the page. 11 12 * CMakeLists.txt: 13 * DerivedSources.make: 14 * inspector/protocol/Canvas.json: Added. 15 16 * inspector/scripts/codegen/generator.py: 17 (Generator.stylized_name_for_enum_value): 18 Add special handling for Canvas.ContextType protocol enumeration, 19 so that "canvas-2d" and "webgl" map to `Canvas2D` and `WebGL`. 20 1 21 2017-06-15 Keith Miller <keith_miller@apple.com> 2 22 -
trunk/Source/JavaScriptCore/DerivedSources.make
r210028 r218376 215 215 $(JavaScriptCore)/inspector/protocol/ApplicationCache.json \ 216 216 $(JavaScriptCore)/inspector/protocol/CSS.json \ 217 $(JavaScriptCore)/inspector/protocol/Canvas.json \ 217 218 $(JavaScriptCore)/inspector/protocol/Console.json \ 218 219 $(JavaScriptCore)/inspector/protocol/DOM.json \ -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py
r213621 r218376 39 39 return str[:1].upper() + str[1:] 40 40 41 _ALWAYS_SPECIALCASED_ENUM_VALUE_SUBSTRINGS = set([' API', 'CSS', 'DOM', 'HTML', 'JIT', 'XHR', 'XML', 'IOS', 'MacOS'])41 _ALWAYS_SPECIALCASED_ENUM_VALUE_SUBSTRINGS = set(['2D', 'API', 'CSS', 'DOM', 'HTML', 'JIT', 'XHR', 'XML', 'IOS', 'MacOS']) 42 42 _ALWAYS_SPECIALCASED_ENUM_VALUE_LOOKUP_TABLE = dict([(s.upper(), s) for s in _ALWAYS_SPECIALCASED_ENUM_VALUE_SUBSTRINGS]) 43 44 _ENUM_IDENTIFIER_RENAME_MAP = { 45 'webgl': 'WebGL', # Canvas.ContextType.webgl 46 } 43 47 44 48 # These objects are built manually by creating and setting InspectorValues. … … 252 256 253 257 # Split on hyphen, introduce camelcase, and force uppercasing of acronyms. 254 subwords = map(ucfirst, enum_value.split('-'))258 subwords = map(ucfirst, _ENUM_IDENTIFIER_RENAME_MAP.get(enum_value, enum_value).split('-')) 255 259 return re.sub(re.compile(regex, re.IGNORECASE), replaceCallback, "".join(subwords)) 256 260 -
trunk/Source/WebCore/CMakeLists.txt
r218179 r218376 1890 1890 inspector/InspectorApplicationCacheAgent.cpp 1891 1891 inspector/InspectorCSSAgent.cpp 1892 inspector/InspectorCanvasAgent.cpp 1892 1893 inspector/InspectorClient.cpp 1893 1894 inspector/InspectorController.cpp -
trunk/Source/WebCore/ChangeLog
r218375 r218376 1 2017-06-15 Matt Baker <mattbaker@apple.com> 2 3 Web Inspector: Instrument 2D/WebGL canvas contexts in the backend 4 https://bugs.webkit.org/show_bug.cgi?id=172623 5 <rdar://problem/32415986> 6 7 Reviewed by Devin Rousso. 8 9 Test: inspector/canvas/create-canvas-contexts.html 10 11 * CMakeLists.txt: 12 * WebCore.xcodeproj/project.pbxproj: 13 14 * dom/Document.cpp: 15 (WebCore::Document::getCSSCanvasElement): 16 Instrument creation of CSS canvases. This merely registers the canvas 17 element with InspectorCanvasAgent and stores the name (identifier passed 18 to getCSSCanvasContext) for later use. It isn't until the context is 19 actually created that the frontend receives a notification. 20 21 * html/HTMLCanvasElement.cpp: 22 (WebCore::HTMLCanvasElement::getContext2d): 23 (WebCore::HTMLCanvasElement::getContextWebGL): 24 Instrument creation of 2D and WebGL canvas contexts. 25 26 * inspector/InspectorAllInOne.cpp: 27 28 * inspector/InspectorCanvasAgent.cpp: Added. 29 New backend agent for canvas inspection. Canvas creation and destruction 30 are continuously monitored by the agent, regardless of the presence of 31 a frontend. This is necessary since there is no way to retrieve the 32 rendering contexts for with a given frame once they've been created. 33 34 (WebCore::InspectorCanvasAgent::InspectorCanvasAgent): 35 (WebCore::InspectorCanvasAgent::didCreateFrontendAndBackend): 36 (WebCore::InspectorCanvasAgent::willDestroyFrontendAndBackend): 37 (WebCore::InspectorCanvasAgent::discardAgent): 38 Unregister canvas observers to prevent dangling agent pointer. 39 (WebCore::InspectorCanvasAgent::enable): 40 Dispatch events for existing canvases, now that the frontend exists. 41 (WebCore::InspectorCanvasAgent::disable): 42 (WebCore::InspectorCanvasAgent::frameNavigated): 43 (WebCore::InspectorCanvasAgent::didCreateCSSCanvas): 44 Register the name/identifier associated with the CSS canvas, so that it 45 can be retrieved and associated with the rendering context later. 46 47 (WebCore::InspectorCanvasAgent::didCreateCanvasRenderingContext): 48 (WebCore::InspectorCanvasAgent::canvasDestroyed): 49 Removes the canvas from the agent, and queues it for notifying the 50 frontend during the next event loop. 51 52 (WebCore::InspectorCanvasAgent::canvasDestroyedTimerFired): 53 (WebCore::InspectorCanvasAgent::clearCanvasData): 54 (WebCore::InspectorCanvasAgent::getCanvasEntry): 55 (WebCore::InspectorCanvasAgent::buildObjectForCanvas): 56 * inspector/InspectorCanvasAgent.h: Added. 57 58 * inspector/InspectorController.cpp: 59 (WebCore::InspectorController::InspectorController): 60 61 * inspector/InspectorInstrumentation.cpp: 62 (WebCore::InspectorInstrumentation::didCommitLoadImpl): 63 (WebCore::InspectorInstrumentation::didCreateCSSCanvasImpl): 64 (WebCore::InspectorInstrumentation::didCreateCanvasRenderingContextImpl): 65 66 * inspector/InspectorInstrumentation.h: 67 (WebCore::InspectorInstrumentation::didCreateCSSCanvas): 68 (WebCore::InspectorInstrumentation::didCreateCanvasRenderingContext): 69 These instrumentation points should not fast return when no frontend 70 is attached. 71 72 * inspector/InstrumentingAgents.cpp: 73 (WebCore::InstrumentingAgents::reset): 74 75 * inspector/InstrumentingAgents.h: 76 (WebCore::InstrumentingAgents::inspectorCanvasAgent): 77 (WebCore::InstrumentingAgents::setInspectorCanvasAgent): 78 Plumbing for the new agent. 79 1 80 2017-06-15 Jer Noble <jer.noble@apple.com> 2 81 -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r218371 r218376 2879 2879 6C4C96DF1AD4483500365672 /* JSReadableStreamBYOBRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C4C96DB1AD4483500365672 /* JSReadableStreamBYOBRequest.h */; }; 2880 2880 6C4C96DF1AD4483500365A50 /* JSReadableStreamDefaultController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C4C96DB1AD4483500365A50 /* JSReadableStreamDefaultController.h */; }; 2881 6A32D7CE1A16D8C000412F0B /* InspectorCanvasAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A4B6D6619D225D8006F11D3 /* InspectorCanvasAgent.cpp */; }; 2882 6A4B6D6519D22519006F11D3 /* InspectorCanvasAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A4B6D6419D22519006F11D3 /* InspectorCanvasAgent.h */; }; 2881 2883 6C638895A96CCEE50C8C946C /* CachedResourceRequestInitiators.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C638893A96CCEE50C8C946C /* CachedResourceRequestInitiators.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2882 2884 6C638896A96CCEE50C8C946C /* CachedResourceRequestInitiators.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6C638894A96CCEE50C8C946C /* CachedResourceRequestInitiators.cpp */; }; … … 10719 10721 6C4C96DB1AD4483500365672 /* JSReadableStreamBYOBRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReadableStreamBYOBRequest.h; sourceTree = "<group>"; }; 10720 10722 6C4C96DB1AD4483500365A50 /* JSReadableStreamDefaultController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReadableStreamDefaultController.h; sourceTree = "<group>"; }; 10723 6A4B6D6419D22519006F11D3 /* InspectorCanvasAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCanvasAgent.h; sourceTree = "<group>"; }; 10724 6A4B6D6619D225D8006F11D3 /* InspectorCanvasAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorCanvasAgent.cpp; sourceTree = "<group>"; }; 10721 10725 6C638893A96CCEE50C8C946C /* CachedResourceRequestInitiators.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResourceRequestInitiators.h; sourceTree = "<group>"; }; 10722 10726 6C638894A96CCEE50C8C946C /* CachedResourceRequestInitiators.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedResourceRequestInitiators.cpp; sourceTree = "<group>"; }; … … 17221 17225 B885E8D211E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp */, 17222 17226 B885E8D311E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h */, 17227 6A4B6D6619D225D8006F11D3 /* InspectorCanvasAgent.cpp */, 17228 6A4B6D6419D22519006F11D3 /* InspectorCanvasAgent.h */, 17223 17229 7A1F2B51126C61B20006A7E6 /* InspectorClient.cpp */, 17224 17230 1C81B9580E97330800266E07 /* InspectorClient.h */, … … 27746 27752 82AB1744124B99EC00C5069D /* InspectorCSSAgent.h in Headers */, 27747 27753 4A9CC82116BF9BB400EC645A /* InspectorCSSOMWrappers.h in Headers */, 27754 6A4B6D6519D22519006F11D3 /* InspectorCanvasAgent.h in Headers */, 27748 27755 7AB0B1C11211A62200A76940 /* InspectorDatabaseAgent.h in Headers */, 27749 27756 41F062140F5F192600A07EAC /* InspectorDatabaseResource.h in Headers */, … … 31724 31731 93309DF1099E64920056E581 /* InsertTextCommand.cpp in Sources */, 31725 31732 B885E8D411E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp in Sources */, 31733 6A32D7CE1A16D8C000412F0B /* InspectorCanvasAgent.cpp in Sources */, 31726 31734 7A1F2B52126C61B20006A7E6 /* InspectorClient.cpp in Sources */, 31727 31735 1C81B95B0E97330800266E07 /* InspectorController.cpp in Sources */, -
trunk/Source/WebCore/dom/Document.cpp
r218229 r218376 5409 5409 { 5410 5410 RefPtr<HTMLCanvasElement>& element = m_cssCanvasElements.add(name, nullptr).iterator->value; 5411 if (!element) 5411 if (!element) { 5412 5412 element = HTMLCanvasElement::create(*this); 5413 InspectorInstrumentation::didCreateCSSCanvas(*element, name); 5414 } 5413 5415 return element.get(); 5414 5416 } -
trunk/Source/WebCore/html/HTMLCanvasElement.cpp
r217651 r218376 44 44 #include "HTMLParserIdioms.h" 45 45 #include "ImageData.h" 46 #include "InspectorInstrumentation.h" 46 47 #include "MIMETypeRegistry.h" 47 48 #include "RenderHTMLCanvas.h" … … 248 249 downcast<CanvasRenderingContext2D>(*m_context).setTracksDisplayListReplay(m_tracksDisplayListReplay); 249 250 251 InspectorInstrumentation::didCreateCanvasRenderingContext(*this); 252 250 253 #if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS) 251 254 // Need to make sure a RenderLayer and compositing layer get created for the Canvas … … 303 306 // Need to make sure a RenderLayer and compositing layer get created for the Canvas 304 307 invalidateStyleAndLayerComposition(); 308 309 InspectorInstrumentation::didCreateCanvasRenderingContext(*this); 305 310 } 306 311 } -
trunk/Source/WebCore/inspector/InspectorAllInOne.cpp
r211771 r218376 32 32 #include "InspectorApplicationCacheAgent.cpp" 33 33 #include "InspectorCSSAgent.cpp" 34 #include "InspectorCanvasAgent.cpp" 34 35 #include "InspectorClient.cpp" 35 36 #include "InspectorController.cpp" -
trunk/Source/WebCore/inspector/InspectorController.cpp
r217509 r218376 39 39 #include "InspectorApplicationCacheAgent.h" 40 40 #include "InspectorCSSAgent.h" 41 #include "InspectorCanvasAgent.h" 41 42 #include "InspectorClient.h" 42 43 #include "InspectorDOMAgent.h" … … 184 185 m_agents.append(std::make_unique<InspectorWorkerAgent>(pageContext)); 185 186 187 auto canvasAgentPtr = std::make_unique<InspectorCanvasAgent>(pageContext, pageAgent); 188 m_instrumentingAgents->setInspectorCanvasAgent(canvasAgentPtr.get()); 189 m_agents.append(WTFMove(canvasAgentPtr)); 190 186 191 ASSERT(m_injectedScriptManager->commandLineAPIHost()); 187 192 if (CommandLineAPIHost* commandLineAPIHost = m_injectedScriptManager->commandLineAPIHost()) { -
trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp
r215173 r218376 41 41 #include "InspectorApplicationCacheAgent.h" 42 42 #include "InspectorCSSAgent.h" 43 #include "InspectorCanvasAgent.h" 43 44 #include "InspectorDOMAgent.h" 44 45 #include "InspectorDOMDebuggerAgent.h" … … 62 63 #include "ScriptController.h" 63 64 #include "WebConsoleAgent.h" 65 #include "WebGLRenderingContextBase.h" 64 66 #include "WebSocketFrame.h" 65 67 #include <inspector/ConsoleMessage.h> … … 749 751 } 750 752 753 if (InspectorCanvasAgent* canvasAgent = instrumentingAgents.inspectorCanvasAgent()) 754 canvasAgent->frameNavigated(loader); 755 751 756 if (InspectorDOMAgent* domAgent = instrumentingAgents.inspectorDOMAgent()) 752 757 domAgent->didCommitLoad(frame.document()); … … 988 993 } 989 994 #endif 995 996 void InspectorInstrumentation::didCreateCSSCanvasImpl(InstrumentingAgents* instrumentingAgents, HTMLCanvasElement& canvasElement, const String& name) 997 { 998 if (InspectorCanvasAgent* canvasAgent = instrumentingAgents->inspectorCanvasAgent()) 999 canvasAgent->didCreateCSSCanvas(canvasElement, name); 1000 } 1001 1002 void InspectorInstrumentation::didCreateCanvasRenderingContextImpl(InstrumentingAgents* instrumentingAgents, HTMLCanvasElement& canvasElement) 1003 { 1004 if (InspectorCanvasAgent* canvasAgent = instrumentingAgents->inspectorCanvasAgent()) 1005 canvasAgent->didCreateCanvasRenderingContext(canvasElement); 1006 } 990 1007 991 1008 #if ENABLE(WEB_REPLAY) -
trunk/Source/WebCore/inspector/InspectorInstrumentation.h
r215173 r218376 37 37 #include "FormData.h" 38 38 #include "Frame.h" 39 #include "HTMLCanvasElement.h" 39 40 #include "HitTestResult.h" 40 41 #include "InspectorController.h" … … 82 83 class ShadowRoot; 83 84 class URL; 85 class WebGLRenderingContextBase; 84 86 class WebKitNamedFlow; 85 87 class WorkerInspectorProxy; … … 243 245 static void didHandleMemoryPressure(Page&, Critical); 244 246 #endif 247 248 static void didCreateCSSCanvas(HTMLCanvasElement&, const String&); 249 static void didCreateCanvasRenderingContext(HTMLCanvasElement&); 245 250 246 251 static void networkStateChanged(Page&); … … 416 421 static void updateApplicationCacheStatusImpl(InstrumentingAgents&, Frame&); 417 422 423 static void didCreateCSSCanvasImpl(InstrumentingAgents*, HTMLCanvasElement&, const String&); 424 static void didCreateCanvasRenderingContextImpl(InstrumentingAgents*, HTMLCanvasElement&); 425 418 426 static void layerTreeDidChangeImpl(InstrumentingAgents&); 419 427 static void renderLayerDestroyedImpl(InstrumentingAgents&, const RenderLayer&); … … 1174 1182 #endif 1175 1183 1184 inline void InspectorInstrumentation::didCreateCSSCanvas(HTMLCanvasElement& canvasElement, const String& name) 1185 { 1186 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(&canvasElement.document())) 1187 didCreateCSSCanvasImpl(instrumentingAgents, canvasElement, name); 1188 } 1189 1190 inline void InspectorInstrumentation::didCreateCanvasRenderingContext(HTMLCanvasElement& canvasElement) 1191 { 1192 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(&canvasElement.document())) 1193 didCreateCanvasRenderingContextImpl(instrumentingAgents, canvasElement); 1194 } 1195 1176 1196 inline void InspectorInstrumentation::networkStateChanged(Page& page) 1177 1197 { -
trunk/Source/WebCore/inspector/InstrumentingAgents.cpp
r208008 r218376 68 68 m_pageHeapAgent = nullptr; 69 69 m_inspectorDOMDebuggerAgent = nullptr; 70 m_inspectorCanvasAgent = nullptr; 70 71 } 71 72 -
trunk/Source/WebCore/inspector/InstrumentingAgents.h
r208008 r218376 45 45 46 46 class InspectorApplicationCacheAgent; 47 class InspectorCanvasAgent; 47 48 class InspectorCSSAgent; 48 49 class InspectorDOMAgent; … … 83 84 InspectorPageAgent* inspectorPageAgent() const { return m_inspectorPageAgent; } 84 85 void setInspectorPageAgent(InspectorPageAgent* agent) { m_inspectorPageAgent = agent; } 86 87 InspectorCanvasAgent* inspectorCanvasAgent() const { return m_inspectorCanvasAgent; } 88 void setInspectorCanvasAgent(InspectorCanvasAgent* agent) { m_inspectorCanvasAgent = agent; } 85 89 86 90 InspectorCSSAgent* inspectorCSSAgent() const { return m_inspectorCSSAgent; } … … 171 175 PageHeapAgent* m_pageHeapAgent { nullptr }; 172 176 InspectorDOMDebuggerAgent* m_inspectorDOMDebuggerAgent { nullptr }; 177 InspectorCanvasAgent* m_inspectorCanvasAgent { nullptr }; 173 178 }; 174 179 -
trunk/Source/WebInspectorUI/ChangeLog
r218359 r218376 1 2017-06-15 Matt Baker <mattbaker@apple.com> 2 3 Web Inspector: Instrument 2D/WebGL canvas contexts in the backend 4 https://bugs.webkit.org/show_bug.cgi?id=172623 5 <rdar://problem/32415986> 6 7 Reviewed by Devin Rousso. 8 9 * UserInterface/Base/Main.js: 10 (WebInspector.loaded): 11 12 * UserInterface/Controllers/CanvasManager.js: Added. 13 New frontend manager for the Canvas domain. 14 (WebInspector.CanvasManager): 15 (WebInspector.CanvasManager.prototype.get canvases): 16 (WebInspector.CanvasManager.prototype.canvasAdded): 17 (WebInspector.CanvasManager.prototype.canvasRemoved): 18 (WebInspector.CanvasManager.prototype._mainResourceDidChange): 19 20 * UserInterface/Main.html: 21 New files. 22 23 * UserInterface/Models/Canvas.js: Added. 24 (WebInspector.Canvas): 25 (WebInspector.Canvas.fromPayload): 26 (WebInspector.Canvas.displayNameForContextType): 27 Get displayable text "2D" or "WebGL" based on context type. 28 (WebInspector.Canvas.resetUniqueDisplayNameNumbers): 29 Called by CanvasManager when canvases are cleared. 30 (WebInspector.Canvas.prototype.get identifier): 31 (WebInspector.Canvas.prototype.get contextType): 32 (WebInspector.Canvas.prototype.get frame): 33 (WebInspector.Canvas.prototype.get cssCanvasName): 34 For CSS canvases, the identifier passed to getCSSCanvasContext. 35 (WebInspector.Canvas.prototype.get displayName): 36 Get displayable canvas name. The name depends on how the canvas was 37 created, and the information available: 38 - getCSSCanvasContext: "CSS Canvas <identifier>" 39 - getContext: "Canvas #<DOM id attribute value>" 40 - Otherwise: "Canvas 1", "Canvas 2", ... 41 42 (WebInspector.Canvas.saveIdentityToCookie): 43 44 * UserInterface/Protocol/CanvasObserver.js: Added. 45 (WebInspector.CanvasObserver.prototype.canvasAdded): 46 (WebInspector.CanvasObserver.prototype.canvasRemoved): 47 (WebInspector.CanvasObserver): 48 49 * UserInterface/Test.html: 50 * UserInterface/Test/Test.js: 51 (WebInspector.loaded): 52 1 53 2017-06-15 Joseph Pecoraro <pecoraro@apple.com> 2 54 -
trunk/Source/WebInspectorUI/UserInterface/Base/Main.js
r218042 r218376 96 96 if (InspectorBackend.registerReplayDispatcher) 97 97 InspectorBackend.registerReplayDispatcher(new WebInspector.ReplayObserver); 98 if (InspectorBackend.registerCanvasDispatcher) 99 InspectorBackend.registerCanvasDispatcher(new WebInspector.CanvasObserver); 98 100 99 101 // Main backend target. … … 137 139 this.replayManager = new WebInspector.ReplayManager; 138 140 this.domDebuggerManager = new WebInspector.DOMDebuggerManager; 141 this.canvasManager = new WebInspector.CanvasManager; 139 142 140 143 // Enable the Console Agent after creating the singleton managers. -
trunk/Source/WebInspectorUI/UserInterface/Main.html
r217924 r218376 275 275 <script src="Protocol/ApplicationCacheObserver.js"></script> 276 276 <script src="Protocol/CSSObserver.js"></script> 277 <script src="Protocol/CanvasObserver.js"></script> 277 278 <script src="Protocol/ConsoleObserver.js"></script> 278 279 <script src="Protocol/DOMObserver.js"></script> … … 318 319 <script src="Models/CSSStyleSheet.js"></script> 319 320 <script src="Models/CallFrame.js"></script> 321 <script src="Models/Canvas.js"></script> 320 322 <script src="Models/Collection.js"></script> 321 323 <script src="Models/CollectionEntry.js"></script> … … 735 737 <script src="Controllers/BreakpointPopoverController.js"></script> 736 738 <script src="Controllers/CSSStyleManager.js"></script> 739 <script src="Controllers/CanvasManager.js"></script> 737 740 <script src="Controllers/CodeMirrorColorEditingController.js"></script> 738 741 <script src="Controllers/CodeMirrorCompletionController.js"></script> -
trunk/Source/WebInspectorUI/UserInterface/Test.html
r217924 r218376 72 72 <script src="Protocol/InspectorObserver.js"></script> 73 73 <script src="Protocol/CSSObserver.js"></script> 74 <script src="Protocol/CanvasObserver.js"></script> 74 75 <script src="Protocol/ConsoleObserver.js"></script> 75 76 <script src="Protocol/DOMObserver.js"></script> … … 106 107 <script src="Models/CallingContextTree.js"></script> 107 108 <script src="Models/CallingContextTreeNode.js"></script> 109 <script src="Models/Canvas.js"></script> 108 110 <script src="Models/Collection.js"></script> 109 111 <script src="Models/CollectionEntry.js"></script> … … 186 188 <script src="Controllers/BreakpointLogMessageLexer.js"></script> 187 189 <script src="Controllers/CSSStyleManager.js"></script> 190 <script src="Controllers/CanvasManager.js"></script> 188 191 <script src="Controllers/DOMDebuggerManager.js"></script> 189 192 <script src="Controllers/DOMTreeManager.js"></script> -
trunk/Source/WebInspectorUI/UserInterface/Test/Test.js
r214841 r218376 50 50 if (InspectorBackend.registerReplayDispatcher) 51 51 InspectorBackend.registerReplayDispatcher(new WebInspector.ReplayObserver); 52 InspectorBackend.registerCanvasDispatcher(new WebInspector.CanvasObserver); 52 53 53 54 WebInspector.mainTarget = new WebInspector.MainTarget; … … 70 71 this.replayManager = new WebInspector.ReplayManager; 71 72 this.domDebuggerManager = new WebInspector.DOMDebuggerManager; 73 this.canvasManager = new WebInspector.CanvasManager; 72 74 73 75 document.addEventListener("DOMContentLoaded", this.contentLoaded);
Note: See TracChangeset
for help on using the changeset viewer.