| 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 1042 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1053 var eventData = event.args["data"] || event.args["beginData"] || {}; | 1053 var eventData = event.args["data"] || event.args["beginData"] || {}; |
| 1054 if (eventData && eventData["stackTrace"]) | 1054 if (eventData && eventData["stackTrace"]) |
| 1055 event.stackTrace = eventData["stackTrace"]; | 1055 event.stackTrace = eventData["stackTrace"]; |
| 1056 | 1056 |
| 1057 if (eventStack.length && eventStack.peekLast().name === recordTypes.Even
tDispatch) | 1057 if (eventStack.length && eventStack.peekLast().name === recordTypes.Even
tDispatch) |
| 1058 eventStack.peekLast().hasChildren = true; | 1058 eventStack.peekLast().hasChildren = true; |
| 1059 this._asyncEventTracker.processEvent(event); | 1059 this._asyncEventTracker.processEvent(event); |
| 1060 if (event.initiator && event.initiator.url) | 1060 if (event.initiator && event.initiator.url) |
| 1061 event.url = event.initiator.url; | 1061 event.url = event.initiator.url; |
| 1062 switch (event.name) { | 1062 switch (event.name) { |
| 1063 case recordTypes.ResourceSendRequest: |
| 1064 case recordTypes.WebSocketCreate: |
| 1065 event.url = event.args["data"]["url"]; |
| 1066 break; |
| 1067 |
| 1063 case recordTypes.ScheduleStyleRecalculation: | 1068 case recordTypes.ScheduleStyleRecalculation: |
| 1064 this._lastScheduleStyleRecalculation[event.args["data"]["frame"]] =
event; | 1069 this._lastScheduleStyleRecalculation[event.args["data"]["frame"]] =
event; |
| 1065 break; | 1070 break; |
| 1066 | 1071 |
| 1067 case recordTypes.UpdateLayoutTree: | 1072 case recordTypes.UpdateLayoutTree: |
| 1068 case recordTypes.RecalculateStyles: | 1073 case recordTypes.RecalculateStyles: |
| 1069 this._invalidationTracker.didRecalcStyle(event); | 1074 this._invalidationTracker.didRecalcStyle(event); |
| 1070 if (event.args["beginData"]) | 1075 if (event.args["beginData"]) |
| 1071 event.initiator = this._lastScheduleStyleRecalculation[event.arg
s["beginData"]["frame"]]; | 1076 event.initiator = this._lastScheduleStyleRecalculation[event.arg
s["beginData"]["frame"]]; |
| 1072 this._lastRecalculateStylesEvent = event; | 1077 this._lastRecalculateStylesEvent = event; |
| (...skipping 1287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2360 if (!id) | 2365 if (!id) |
| 2361 return; | 2366 return; |
| 2362 /** @type {!Map<string, !WebInspector.TracingModel.Event>|undefined} */ | 2367 /** @type {!Map<string, !WebInspector.TracingModel.Event>|undefined} */ |
| 2363 var initiatorMap = this._initiatorByType.get(initiatorType); | 2368 var initiatorMap = this._initiatorByType.get(initiatorType); |
| 2364 if (isInitiator) | 2369 if (isInitiator) |
| 2365 initiatorMap.set(id, event); | 2370 initiatorMap.set(id, event); |
| 2366 else | 2371 else |
| 2367 event.initiator = initiatorMap.get(id) || null; | 2372 event.initiator = initiatorMap.get(id) || null; |
| 2368 } | 2373 } |
| 2369 } | 2374 } |
| OLD | NEW |