Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.()

third_party/WebKit/Source/devtools/front_end/timeline/TimelineModel.js

 /*
  * Copyright (C) 2012 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 39 matching lines @@
 
     Animation: "Animation",
     RequestMainThreadFrame: "RequestMainThreadFrame",
     BeginFrame: "BeginFrame",
     NeedsBeginFrameChanged: "NeedsBeginFrameChanged",
     BeginMainThreadFrame: "BeginMainThreadFrame",
     ActivateLayerTree: "ActivateLayerTree",
     DrawFrame: "DrawFrame",
     HitTest: "HitTest",
     ScheduleStyleRecalculation: "ScheduleStyleRecalculation",
-    RecalculateStyles: "RecalculateStyles", // For backwards compatibility only, now replaced by UpdateLayoutTree.
-    UpdateLayoutTree: "UpdateLayoutTree",

[samli, 2016/05/10 03:44:00]

I think this might actually need to stick around for backwards compatibility
since timeline can load old timeline files. caseq@ can confirm.

+    RecalculateStyles: "RecalculateStyles", // For backwards compatibility only, now replaced by UpdateStyleAndLayoutTree.
+    UpdateStyleAndLayoutTree: "UpdateStyleAndLayoutTree",
     InvalidateLayout: "InvalidateLayout",
     Layout: "Layout",
     UpdateLayer: "UpdateLayer",
     UpdateLayerTree: "UpdateLayerTree",
     PaintSetup: "PaintSetup",
     Paint: "Paint",
     PaintImage: "PaintImage",
     Rasterize: "Rasterize",
     RasterTask: "RasterTask",
     ScrollLayer: "ScrollLayer",
@@ skipping 745 matching lines @@
         switch (event.name) {
         case recordTypes.ResourceSendRequest:
         case recordTypes.WebSocketCreate:
             event.url = event.args["data"]["url"];
             break;
 
         case recordTypes.ScheduleStyleRecalculation:
             this._lastScheduleStyleRecalculation[event.args["data"]["frame"]] = event;
             break;
 
-        case recordTypes.UpdateLayoutTree:
+        case recordTypes.UpdateStyleAndLayoutTree:
         case recordTypes.RecalculateStyles:
             this._invalidationTracker.didRecalcStyle(event);
             if (event.args["beginData"])
                 event.initiator = this._lastScheduleStyleRecalculation[event.args["beginData"]["frame"]];
             this._lastRecalculateStylesEvent = event;
             if (this._currentScriptEvent)
                 event.warning = WebInspector.TimelineModel.WarningType.ForcedStyle;
             break;
 
         case recordTypes.ScheduleStyleInvalidationTracking:
@@ skipping 929 matching lines @@
     },
 
     /**
      * @return {!Map<string, !Map<number, number>>}
      */
     files: function()
     {
         return this._files;
     }
 }