OLD | NEW |
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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 } | 234 } |
235 | 235 |
236 } // namespace InspectorInstrumentation | 236 } // namespace InspectorInstrumentation |
237 | 237 |
238 namespace InstrumentationEvents { | 238 namespace InstrumentationEvents { |
239 const char PaintSetup[] = "PaintSetup"; | 239 const char PaintSetup[] = "PaintSetup"; |
240 const char RasterTask[] = "RasterTask"; | 240 const char RasterTask[] = "RasterTask"; |
241 const char Paint[] = "Paint"; | 241 const char Paint[] = "Paint"; |
242 const char Layer[] = "Layer"; | 242 const char Layer[] = "Layer"; |
243 const char BeginFrame[] = "BeginFrame"; | 243 const char BeginFrame[] = "BeginFrame"; |
| 244 const char ActivateLayerTree[] = "ActivateLayerTree"; |
244 }; | 245 }; |
245 | 246 |
246 namespace InstrumentationEventArguments { | 247 namespace InstrumentationEventArguments { |
| 248 const char FrameId[] = "frameId"; |
247 const char LayerId[] = "layerId"; | 249 const char LayerId[] = "layerId"; |
248 const char LayerTreeId[] = "layerTreeId"; | 250 const char LayerTreeId[] = "layerTreeId"; |
249 const char PageId[] = "pageId"; | 251 const char PageId[] = "pageId"; |
250 }; | 252 }; |
251 | 253 |
252 InstrumentingAgents* instrumentationForPage(Page* page) | 254 InstrumentingAgents* instrumentationForPage(Page* page) |
253 { | 255 { |
254 ASSERT(isMainThread()); | 256 ASSERT(isMainThread()); |
255 return page->inspectorController().m_instrumentingAgents.get(); | 257 return page->inspectorController().m_instrumentingAgents.get(); |
256 } | 258 } |
257 | 259 |
258 InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope* work
erGlobalScope) | 260 InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope* work
erGlobalScope) |
259 { | 261 { |
260 if (WorkerInspectorController* controller = workerGlobalScope->workerInspect
orController()) | 262 if (WorkerInspectorController* controller = workerGlobalScope->workerInspect
orController()) |
261 return controller->m_instrumentingAgents.get(); | 263 return controller->m_instrumentingAgents.get(); |
262 return 0; | 264 return 0; |
263 } | 265 } |
264 | 266 |
265 } // namespace WebCore | 267 } // namespace WebCore |
266 | 268 |
OLD | NEW |