Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / devtools / front_end / timeline / MemoryCountersGraph.js

diff --git a/src/third_party/WebKit/Source/devtools/front_end/timeline/MemoryCountersGraph.js b/src/third_party/WebKit/Source/devtools/front_end/timeline/MemoryCountersGraph.js
index 6244847..737e8ca 100644 (file)
--- a/src/third_party/WebKit/Source/devtools/front_end/timeline/MemoryCountersGraph.js
+++ b/src/third_party/WebKit/Source/devtools/front_end/timeline/MemoryCountersGraph.js
@@ -34,16 +34,18 @@
  * @implements {WebInspector.TimelineModeView}
  * @param {!WebInspector.TimelineModeViewDelegate} delegate
  * @param {!WebInspector.TimelineModel} model
+ * @param {!WebInspector.TimelineUIUtils} uiUtils
  */
-WebInspector.MemoryCountersGraph = function(delegate, model)
+WebInspector.MemoryCountersGraph = function(delegate, model, uiUtils)
 {
     WebInspector.CountersGraph.call(this, WebInspector.UIString("MEMORY"), delegate, model);
+    this._uiUtils = uiUtils;
     this._countersByName = {};
     this._countersByName["jsHeapSizeUsed"] = this.createCounter(WebInspector.UIString("Used JS Heap"), WebInspector.UIString("JS Heap Size: %d"), "hsl(220, 90%, 43%)");
     this._countersByName["documents"] = this.createCounter(WebInspector.UIString("Documents"), WebInspector.UIString("Documents: %d"), "hsl(0, 90%, 43%)");
     this._countersByName["nodes"] = this.createCounter(WebInspector.UIString("Nodes"), WebInspector.UIString("Nodes: %d"), "hsl(120, 90%, 43%)");
     this._countersByName["jsEventListeners"] = this.createCounter(WebInspector.UIString("Listeners"), WebInspector.UIString("Listeners: %d"), "hsl(38, 90%, 43%)");
-    if (WebInspector.experimentsSettings.gpuTimeline.isEnabled()) {
+    if (Runtime.experiments.isEnabled("gpuTimeline")) {
         this._gpuMemoryCounter = this.createCounter(WebInspector.UIString("GPU Memory"), WebInspector.UIString("GPU Memory [KB]: %d"), "hsl(300, 90%, 43%)");
         this._countersByName["gpuMemoryUsedKB"] = this._gpuMemoryCounter;
     }
@@ -69,9 +71,9 @@ WebInspector.MemoryCountersGraph.prototype = {
          */
         function addStatistics(record)
         {
-            if (record.type() !== WebInspector.TimelineModel.RecordType.UpdateCounters)
+            var counters = this._uiUtils.countersForRecord(record);
+            if (!counters)
                 return;
-            var counters = record.data();
             for (var name in counters) {
                 var counter = this._countersByName[name];
                 if (counter)