Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js b/src/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
index 1082bbe..943fa31 100644 (file)
--- a/src/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
+++ b/src/third_party/WebKit/Source/devtools/front_end/sdk/ResourceTreeModel.js
@@ -30,12 +30,12 @@
 
 /**
  * @constructor
- * @extends {WebInspector.TargetAwareObject}
+ * @extends {WebInspector.SDKModel}
  * @param {!WebInspector.Target} target
  */
 WebInspector.ResourceTreeModel = function(target)
 {
-    WebInspector.TargetAwareObject.call(this, target);
+    WebInspector.SDKModel.call(this, WebInspector.ResourceTreeModel, target);
 
     target.networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.RequestFinished, this._onRequestFinished, this);
     target.networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.RequestUpdateDropped, this._onRequestUpdateDropped, this);
@@ -61,7 +61,6 @@ WebInspector.ResourceTreeModel.EventTypes = {
     FrameDetached: "FrameDetached",
     FrameResized: "FrameResized",
     MainFrameNavigated: "MainFrameNavigated",
-    MainFrameCreatedOrNavigated: "MainFrameCreatedOrNavigated",
     ResourceAdded: "ResourceAdded",
     WillLoadCachedResources: "WillLoadCachedResources",
     CachedResourcesLoaded: "CachedResourcesLoaded",
@@ -72,7 +71,8 @@ WebInspector.ResourceTreeModel.EventTypes = {
     SecurityOriginAdded: "SecurityOriginAdded",
     SecurityOriginRemoved: "SecurityOriginRemoved",
     ScreencastFrame: "ScreencastFrame",
-    ScreencastVisibilityChanged: "ScreencastVisibilityChanged"
+    ScreencastVisibilityChanged: "ScreencastVisibilityChanged",
+    ViewportChanged: "ViewportChanged"
 }
 
 WebInspector.ResourceTreeModel.prototype = {
@@ -87,7 +87,9 @@ WebInspector.ResourceTreeModel.prototype = {
     _processCachedResources: function(error, mainFramePayload)
     {
         if (error) {
-            console.error(JSON.stringify(error));
+            //FIXME: remove resourceTreeModel from worker
+            if (!this.target().isWorkerTarget())
+                console.error(JSON.stringify(error));
             return;
         }
 
@@ -142,8 +144,6 @@ WebInspector.ResourceTreeModel.prototype = {
         this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameAdded, frame);
         if (!aboutToNavigate)
             this._addSecurityOrigin(frame.securityOrigin);
-        if (frame.isMainFrame())
-            this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.MainFrameCreatedOrNavigated, frame);
     },
 
     /**
@@ -248,10 +248,8 @@ WebInspector.ResourceTreeModel.prototype = {
             this._inspectedPageURL = frame.url;
 
         this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.FrameNavigated, frame);
-        if (frame.isMainFrame()) {
+        if (frame.isMainFrame())
             this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.MainFrameNavigated, frame);
-            this.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.MainFrameCreatedOrNavigated, frame);
-        }
         if (addedOrigin)
             this._addSecurityOrigin(addedOrigin);
 
@@ -320,7 +318,7 @@ WebInspector.ResourceTreeModel.prototype = {
         if (frame._resourcesMap[url])
             return;
 
-        var resource = new WebInspector.Resource(null, url, frame.url, frameId, event.data.loaderId, WebInspector.resourceTypes[event.data.resourceType], event.data.mimeType);
+        var resource = new WebInspector.Resource(this.target(), null, url, frame.url, frameId, event.data.loaderId, WebInspector.resourceTypes[event.data.resourceType], event.data.mimeType);
         frame.addResource(resource);
     },
 
@@ -462,7 +460,7 @@ WebInspector.ResourceTreeModel.prototype = {
      */
     _createResourceFromFramePayload: function(frame, url, type, mimeType)
     {
-        return new WebInspector.Resource(null, url, frame.url, frame.id, frame.loaderId, type, mimeType);
+        return new WebInspector.Resource(this.target(), null, url, frame.url, frame.id, frame.loaderId, type, mimeType);
     },
 
     /**
@@ -476,7 +474,7 @@ WebInspector.ResourceTreeModel.prototype = {
         this._agent.reload(ignoreCache, scriptToEvaluateOnLoad, scriptPreprocessor);
     },
 
-    __proto__: WebInspector.TargetAwareObject.prototype
+    __proto__: WebInspector.SDKModel.prototype
 }
 
 /**
@@ -662,7 +660,7 @@ WebInspector.ResourceTreeFrame.prototype = {
             // Already in the tree, we just got an extra update.
             return resource;
         }
-        resource = new WebInspector.Resource(request, request.url, request.documentURL, request.frameId, request.loaderId, request.type, request.mimeType);
+        resource = new WebInspector.Resource(this.target(), request, request.url, request.documentURL, request.frameId, request.loaderId, request.type, request.mimeType);
         this._resourcesMap[resource.url] = resource;
         this._model.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.ResourceAdded, resource);
         return resource;
@@ -816,6 +814,14 @@ WebInspector.PageDispatcher.prototype = {
     screencastVisibilityChanged: function(visible)
     {
         this._resourceTreeModel.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.ScreencastVisibilityChanged, {visible:visible});
+    },
+
+    /**
+     * @param {!PageAgent.Viewport=} viewport
+     */
+    viewportChanged: function(viewport)
+    {
+        this._resourceTreeModel.dispatchEventToListeners(WebInspector.ResourceTreeModel.EventTypes.ViewportChanged, viewport);
     }
 }