Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Side by Side Diff: Source/core/inspector/InspectorInstrumentation.cpp

Issue 18344005: DevTools: expose setLayerTreeId() so we can relate events from LayerTreeHost (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed another regression Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 } // namespace InspectorInstrumentation 227 } // namespace InspectorInstrumentation
228 228
229 namespace InstrumentationEvents { 229 namespace InstrumentationEvents {
230 const char PaintSetup[] = "PaintSetup"; 230 const char PaintSetup[] = "PaintSetup";
231 const char PaintLayer[] = "PaintLayer"; 231 const char PaintLayer[] = "PaintLayer";
232 const char RasterTask[] = "RasterTask"; 232 const char RasterTask[] = "RasterTask";
233 const char ImageDecodeTask[] = "ImageDecodeTask"; 233 const char ImageDecodeTask[] = "ImageDecodeTask";
234 const char Paint[] = "Paint"; 234 const char Paint[] = "Paint";
235 const char Layer[] = "Layer"; 235 const char Layer[] = "Layer";
236 const char BeginFrame[] = "BeginFrame"; 236 const char BeginFrame[] = "BeginFrame";
237 const char UpdateLayer[] = "UpdateLayer";
237 }; 238 };
238 239
239 namespace InstrumentationEventArguments { 240 namespace InstrumentationEventArguments {
240 const char LayerId[] = "layerId"; 241 const char LayerId[] = "layerId";
242 const char LayerTreeId[] = "layerTreeId";
243 const char NodeId[] = "nodeId";
241 const char PageId[] = "pageId"; 244 const char PageId[] = "pageId";
242 const char NodeId[] = "nodeId";
243 }; 245 };
244 246
245 InstrumentingAgents* instrumentationForPage(Page* page) 247 InstrumentingAgents* instrumentationForPage(Page* page)
246 { 248 {
247 ASSERT(isMainThread()); 249 ASSERT(isMainThread());
248 if (InspectorController* controller = page->inspectorController()) 250 if (InspectorController* controller = page->inspectorController())
249 return controller->m_instrumentingAgents.get(); 251 return controller->m_instrumentingAgents.get();
250 return 0; 252 return 0;
251 } 253 }
252 254
253 InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope* work erGlobalScope) 255 InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope* work erGlobalScope)
254 { 256 {
255 if (WorkerInspectorController* controller = workerGlobalScope->workerInspect orController()) 257 if (WorkerInspectorController* controller = workerGlobalScope->workerInspect orController())
256 return controller->m_instrumentingAgents.get(); 258 return controller->m_instrumentingAgents.get();
257 return 0; 259 return 0;
258 } 260 }
259 261
260 } // namespace WebCore 262 } // namespace WebCore
261 263
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorInstrumentation.h ('k') | Source/core/inspector/InspectorTimelineAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698