Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/Source/devtools/front_end/timeline/TimelineModelImpl.js b/src/third_party/WebKit/Source/devtools/front_end/timeline/TimelineModelImpl.js
index 7ddf613..e427b1f 100644 (file)
--- a/src/third_party/WebKit/Source/devtools/front_end/timeline/TimelineModelImpl.js
+++ b/src/third_party/WebKit/Source/devtools/front_end/timeline/TimelineModelImpl.js
@@ -55,7 +55,7 @@ WebInspector.TimelineModelImpl.prototype = {
 
         this._clientInitiatedRecording = true;
         var maxStackFrames = captureStacks ? 30 : 0;
-        var includeGPUEvents = WebInspector.experimentsSettings.gpuTimeline.isEnabled();
+        var includeGPUEvents = Runtime.experiments.isEnabled("gpuTimeline");
         var liveEvents = [ WebInspector.TimelineModel.RecordType.BeginFrame,
                            WebInspector.TimelineModel.RecordType.DrawFrame,
                            WebInspector.TimelineModel.RecordType.RequestMainThreadFrame,
@@ -496,7 +496,7 @@ WebInspector.TimelineModel.RecordImpl.prototype = {
     {
         if (!this._userObjects)
             this._userObjects = new StringMap();
-        this._userObjects.put(key, value);
+        this._userObjects.set(key, value);
     },
 
     /**