Timeline: remove TimelineModel inferred properties from TracingModel.Event

third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineFrameModel.js

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 321 matching lines @@
       this._framePendingCommit =
           new WebInspector.PendingFrame(this._lastTaskBeginTime || event.startTime, this._currentTaskTimeByCategory);
     if (!this._framePendingCommit) {
       this._addTimeForCategory(this._currentTaskTimeByCategory, event);
       return;
     }
     this._addTimeForCategory(this._framePendingCommit.timeByCategory, event);
 
     if (event.name === eventNames.BeginMainThreadFrame && event.args['data'] && event.args['data']['frameId'])
       this._framePendingCommit.mainFrameId = event.args['data']['frameId'];
-    if (event.name === eventNames.Paint && event.args['data']['layerId'] && event.picture && this._target)
+    if (event.name === eventNames.Paint && event.args['data']['layerId'] && WebInspector.TimelineData.forEvent(event).picture && this._target)
       this._framePendingCommit.paints.push(new WebInspector.LayerPaintEvent(event, this._target));
     if (event.name === eventNames.CompositeLayers && event.args['layerTreeId'] === this._layerTreeId)
       this.handleCompositeLayers();
   }
 
   /**
    * @param {!Object.<string, number>} timeByCategory
    * @param {!WebInspector.TracingModel.Event} event
    */
   _addTimeForCategory(timeByCategory, event) {
@@ skipping 148 matching lines @@
    * @return {!WebInspector.TracingModel.Event}
    */
   event() {
     return this._event;
   }
 
   /**
    * @return {!Promise<?{rect: !Array<number>, serializedPicture: string}>}
    */
   picturePromise() {
-    return this._event.picture.objectPromise().then(result => {
+    var picture = WebInspector.TimelineData.forEvent(this._event).picture;
+    return picture.objectPromise().then(result => {
       if (!result)
         return null;
       var rect = result['params'] && result['params']['layer_rect'];
       var picture = result['skp64'];
       return rect && picture ? {rect: rect, serializedPicture: picture} : null;
     });
   }
 
   /**
    * @return !Promise<?{rect: !Array<number>, snapshot: !WebInspector.PaintProfilerSnapshot}>}
@@ skipping 19 matching lines @@
   constructor(triggerTime, timeByCategory) {
     /** @type {!Object.<string, number>} */
     this.timeByCategory = timeByCategory;
     /** @type {!Array.<!WebInspector.LayerPaintEvent>} */
     this.paints = [];
     /** @type {number|undefined} */
     this.mainFrameId = undefined;
     this.triggerTime = triggerTime;
   }
 };