Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/Source/devtools/front_end/profiler/CanvasProfileView.js b/src/third_party/WebKit/Source/devtools/front_end/profiler/CanvasProfileView.js
index dd73f9e..03f5f8f 100644 (file)
--- a/src/third_party/WebKit/Source/devtools/front_end/profiler/CanvasProfileView.js
+++ b/src/third_party/WebKit/Source/devtools/front_end/profiler/CanvasProfileView.js
@@ -624,6 +624,7 @@ WebInspector.CanvasProfileView.prototype = {
 
 /**
  * @constructor
+ * @implements {WebInspector.TargetManager.Observer}
  * @extends {WebInspector.ProfileType}
  */
 WebInspector.CanvasProfileType = function()
@@ -647,12 +648,9 @@ WebInspector.CanvasProfileType = function()
     this._frameSelector.element.title = WebInspector.UIString("Frame containing the canvases to capture.");
     this._frameSelector.element.classList.add("hidden");
 
-    this._target = /** @type {!WebInspector.Target} */ (WebInspector.targetManager.mainTarget());
-    this._target.resourceTreeModel.frames().forEach(this._addFrame, this);
-    this._target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameAdded, this._frameAdded, this);
-    this._target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameDetached, this._frameRemoved, this);
+    this._target = null;
+    WebInspector.targetManager.observeTargets(this);
 
-    this._dispatcher = new WebInspector.CanvasDispatcher(this);
     this._canvasAgentEnabled = false;
 
     this._decorationElement = document.createElement("div");
@@ -663,6 +661,34 @@ WebInspector.CanvasProfileType = function()
 WebInspector.CanvasProfileType.TypeId = "CANVAS_PROFILE";
 
 WebInspector.CanvasProfileType.prototype = {
+    /**
+     * @override
+     * @param {!WebInspector.Target} target
+     */
+    targetAdded: function(target)
+    {
+        if (this._target || target !== WebInspector.targetManager.mainTarget())
+            return;
+        this._target = target;
+        this._target.resourceTreeModel.frames().forEach(this._addFrame, this);
+        this._target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameAdded, this._frameAdded, this);
+        this._target.resourceTreeModel.addEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameDetached, this._frameRemoved, this);
+        new WebInspector.CanvasDispatcher(this._target, this);
+    },
+
+    /**
+     * @override
+     * @param {!WebInspector.Target} target
+     */
+    targetRemoved: function(target)
+    {
+        if (this._target !== target)
+            return;
+        this._target = null;
+        this._target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameAdded, this._frameAdded, this);
+        this._target.resourceTreeModel.removeEventListener(WebInspector.ResourceTreeModel.EventTypes.FrameDetached, this._frameRemoved, this);
+    },
+
     get statusBarItems()
     {
         return [this._capturingModeSelector.element, this._frameSelector.element];
@@ -781,13 +807,16 @@ WebInspector.CanvasProfileType.prototype = {
     {
         this._decorationElement.removeChildren();
         this._decorationElement.createChild("div", "warning-icon-small");
-        this._decorationElement.appendChild(document.createTextNode(this._canvasAgentEnabled ? WebInspector.UIString("Canvas Profiler is enabled.") : WebInspector.UIString("Canvas Profiler is disabled.")));
+        this._decorationElement.createTextChild(this._canvasAgentEnabled ? WebInspector.UIString("Canvas Profiler is enabled.") : WebInspector.UIString("Canvas Profiler is disabled."));
         var button = this._decorationElement.createChild("button", "text-button");
         button.type = "button";
         button.textContent = this._canvasAgentEnabled ? WebInspector.UIString("Disable") : WebInspector.UIString("Enable");
         button.addEventListener("click", this._onProfilerEnableButtonClick.bind(this, !this._canvasAgentEnabled), false);
 
         var target = this._target;
+        if (!target)
+            return;
+
         /**
          * @param {?Protocol.Error} error
          * @param {boolean} result
@@ -800,7 +829,7 @@ WebInspector.CanvasProfileType.prototype = {
 
         if (forcePageReload) {
             if (this._canvasAgentEnabled) {
-                CanvasAgent.hasUninstrumentedCanvases(hasUninstrumentedCanvasesCallback);
+                target.canvasAgent().hasUninstrumentedCanvases(hasUninstrumentedCanvasesCallback);
             } else {
                 for (var frameId in this._framesWithCanvases) {
                     if (this._framesWithCanvases.hasOwnProperty(frameId)) {
@@ -966,12 +995,13 @@ WebInspector.CanvasProfileType.prototype = {
 /**
  * @constructor
  * @implements {CanvasAgent.Dispatcher}
+ * @param {!WebInspector.Target} target
  * @param {!WebInspector.CanvasProfileType} profileType
  */
-WebInspector.CanvasDispatcher = function(profileType)
+WebInspector.CanvasDispatcher = function(target, profileType)
 {
     this._profileType = profileType;
-    InspectorBackend.registerCanvasDispatcher(this);
+    target.registerCanvasDispatcher(this);
 }
 
 WebInspector.CanvasDispatcher.prototype = {
@@ -996,7 +1026,7 @@ WebInspector.CanvasDispatcher.prototype = {
 /**
  * @constructor
  * @extends {WebInspector.ProfileHeader}
- * @param {!WebInspector.Target} target
+ * @param {?WebInspector.Target} target
  * @param {!WebInspector.CanvasProfileType} type
  * @param {!CanvasAgent.TraceLogId=} traceLogId
  * @param {!PageAgent.FrameId=} frameId