/**
* @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);
SecurityOriginAdded: "SecurityOriginAdded",
SecurityOriginRemoved: "SecurityOriginRemoved",
ScreencastFrame: "ScreencastFrame",
- ScreencastVisibilityChanged: "ScreencastVisibilityChanged"
+ ScreencastVisibilityChanged: "ScreencastVisibilityChanged",
+ ViewportChanged: "ViewportChanged"
}
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;
}
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);
},
*/
_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);
},
/**
this._agent.reload(ignoreCache, scriptToEvaluateOnLoad, scriptPreprocessor);
},
- __proto__: WebInspector.TargetAwareObject.prototype
+ __proto__: WebInspector.SDKModel.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;
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);
}
}