Modified: trunk/Source/WebCore/ChangeLog (129897 => 129898)
--- trunk/Source/WebCore/ChangeLog 2012-09-28 15:24:41 UTC (rev 129897)
+++ trunk/Source/WebCore/ChangeLog 2012-09-28 15:30:21 UTC (rev 129898)
@@ -1,3 +1,34 @@
+2012-09-28 Pavel Feldman <[email protected]>
+
+ Web Inspector: define ChunkedReader interface for compilation
+ https://bugs.webkit.org/show_bug.cgi?id=97904
+
+ Reviewed by Alexander Pavlov.
+
+ Otherwise, it is unclear what "source" is in the OutputStreamDelegate.
+
+ * inspector/front-end/FileUtils.js:
+ (WebInspector.OutputStreamDelegate.prototype.onTransferStarted):
+ (WebInspector.OutputStreamDelegate.prototype.onTransferFinished):
+ (WebInspector.OutputStreamDelegate.prototype.onChunkTransferred):
+ (WebInspector.OutputStreamDelegate.prototype.onError):
+ (WebInspector.ChunkedReader):
+ (WebInspector.ChunkedReader.prototype.fileSize):
+ (WebInspector.ChunkedReader.prototype.loadedSize):
+ (WebInspector.ChunkedReader.prototype.fileName):
+ (WebInspector.ChunkedReader.prototype.cancel):
+ (WebInspector.ChunkedFileReader.prototype.start):
+ (WebInspector.ChunkedFileReader.prototype._onChunkLoaded):
+ (WebInspector.ChunkedXHRReader.prototype.start):
+ (WebInspector.ChunkedXHRReader.prototype._onLoad):
+ * inspector/front-end/HeapSnapshotView.js:
+ (WebInspector.HeapSnapshotLoadFromFileDelegate.prototype.onTransferStarted):
+ (WebInspector.HeapSnapshotLoadFromFileDelegate.prototype.onChunkTransferred):
+ (WebInspector.HeapSnapshotLoadFromFileDelegate.prototype.onTransferFinished):
+ (WebInspector.HeapSnapshotLoadFromFileDelegate.prototype.onError):
+ * inspector/front-end/TimelineModel.js:
+ (WebInspector.TimelineModelLoadFromFileDelegate.prototype.onTransferStarted):
+
2012-09-28 Florin Malita <[email protected]>
[Chromium] Incorrect resampling of clipped/masked images.
Modified: trunk/Source/WebCore/inspector/front-end/FileUtils.js (129897 => 129898)
--- trunk/Source/WebCore/inspector/front-end/FileUtils.js 2012-09-28 15:24:41 UTC (rev 129897)
+++ trunk/Source/WebCore/inspector/front-end/FileUtils.js 2012-09-28 15:30:21 UTC (rev 129898)
@@ -36,11 +36,19 @@
}
WebInspector.OutputStreamDelegate.prototype = {
- onTransferStarted: function(source) { },
+ onTransferStarted: function() { },
- onChunkTransferred: function(source) { },
+ onTransferFinished: function() { },
- onError: function(source, event) { }
+ /**
+ * @param {WebInspector.ChunkedReader} reader
+ */
+ onChunkTransferred: function(reader) { },
+
+ /**
+ * @param {WebInspector.ChunkedReader} reader
+ */
+ onError: function(reader, event) { },
}
/**
@@ -61,7 +69,34 @@
}
/**
+ * @interface
+ */
+WebInspector.ChunkedReader = function()
+{
+}
+
+WebInspector.ChunkedReader.prototype = {
+ /**
+ * @return {number}
+ */
+ fileSize: function() { },
+
+ /**
+ * @return {number}
+ */
+ loadedSize: function() { },
+
+ /**
+ * @return {string}
+ */
+ fileName: function() { },
+
+ cancel: function() { }
+}
+
+/**
* @constructor
+ * @implements {WebInspector.ChunkedReader}
* @param {!File} file
* @param {number} chunkSize
* @param {!WebInspector.OutputStreamDelegate} delegate
@@ -87,7 +122,7 @@
this._reader = new FileReader();
this._reader._onload_ = this._onChunkLoaded.bind(this);
this._reader._onerror_ = this._delegate.onError.bind(this._delegate, this);
- this._delegate.onTransferStarted(this);
+ this._delegate.onTransferStarted();
this._loadChunk();
},
@@ -96,16 +131,25 @@
this._isCanceled = true;
},
+ /**
+ * @return {number}
+ */
loadedSize: function()
{
return this._loadedSize;
},
+ /**
+ * @return {number}
+ */
fileSize: function()
{
return this._fileSize;
},
+ /**
+ * @return {string}
+ */
fileName: function()
{
return this._file.name;
@@ -134,7 +178,7 @@
this._file = null;
this._reader = null;
this._output.close();
- this._delegate.onTransferFinished(this);
+ this._delegate.onTransferFinished();
return;
}
@@ -152,6 +196,7 @@
/**
* @constructor
+ * @implements {WebInspector.ChunkedReader}
* @param {string} url
* @param {!WebInspector.OutputStreamDelegate} delegate
*/
@@ -179,7 +224,7 @@
this._xhr._onerror_ = this._delegate.onError.bind(this._delegate, this);
this._xhr.send(null);
- this._delegate.onTransferStarted(this);
+ this._delegate.onTransferStarted();
},
cancel: function()
@@ -188,16 +233,25 @@
this._xhr.abort();
},
+ /**
+ * @return {number}
+ */
loadedSize: function()
{
return this._loadedSize;
},
+ /**
+ * @return {number}
+ */
fileSize: function()
{
return this._fileSize;
},
+ /**
+ * @return {string}
+ */
fileName: function()
{
return this._url;
@@ -236,7 +290,7 @@
return;
this._output.close();
- this._delegate.onTransferFinished(this);
+ this._delegate.onTransferFinished();
}
}
Modified: trunk/Source/WebCore/inspector/front-end/HeapSnapshotView.js (129897 => 129898)
--- trunk/Source/WebCore/inspector/front-end/HeapSnapshotView.js 2012-09-28 15:24:41 UTC (rev 129897)
+++ trunk/Source/WebCore/inspector/front-end/HeapSnapshotView.js 2012-09-28 15:30:21 UTC (rev 129898)
@@ -1005,34 +1005,40 @@
}
WebInspector.HeapSnapshotLoadFromFileDelegate.prototype = {
- onTransferStarted: function(source)
+ onTransferStarted: function()
{
},
- onChunkTransferred: function(source)
+ /**
+ * @param {WebInspector.ChunkedReader} reader
+ */
+ onChunkTransferred: function(reader)
{
this._snapshotHeader.sidebarElement.subtitle = WebInspector.UIString(
- "Loading\u2026 %d%", (source.loadedSize() * 100 / source.fileSize()).toFixed(2));
+ "Loading\u2026 %d%", (reader.loadedSize() * 100 / reader.fileSize()).toFixed(2));
},
- onTransferFinished: function(source)
+ onTransferFinished: function()
{
this._snapshotHeader.finishHeapSnapshot(true);
},
- onError: function (source, e)
+ /**
+ * @param {WebInspector.ChunkedReader} reader
+ */
+ onError: function (reader, e)
{
switch(e.target.error.code) {
case e.target.error.NOT_FOUND_ERR:
- this._snapshotHeader.sidebarElement.subtitle = WebInspector.UIString("'%s' not found.", source.fileName());
+ this._snapshotHeader.sidebarElement.subtitle = WebInspector.UIString("'%s' not found.", reader.fileName());
break;
case e.target.error.NOT_READABLE_ERR:
- this._snapshotHeader.sidebarElement.subtitle = WebInspector.UIString("'%s' is not readable", source.fileName());
+ this._snapshotHeader.sidebarElement.subtitle = WebInspector.UIString("'%s' is not readable", reader.fileName());
break;
case e.target.error.ABORT_ERR:
break;
default:
- this._snapshotHeader.sidebarElement.subtitle = WebInspector.UIString("'%s' error %d", source.fileName(), e.target.error.code);
+ this._snapshotHeader.sidebarElement.subtitle = WebInspector.UIString("'%s' error %d", reader.fileName(), e.target.error.code);
}
}
}
Modified: trunk/Source/WebCore/inspector/front-end/TimelineModel.js (129897 => 129898)
--- trunk/Source/WebCore/inspector/front-end/TimelineModel.js 2012-09-28 15:24:41 UTC (rev 129897)
+++ trunk/Source/WebCore/inspector/front-end/TimelineModel.js 2012-09-28 15:30:21 UTC (rev 129898)
@@ -330,11 +330,14 @@
}
WebInspector.TimelineModelLoadFromFileDelegate.prototype = {
- onTransferStarted: function(reader)
+ onTransferStarted: function()
{
this._progress.setTitle(WebInspector.UIString("Loading\u2026"));
},
+ /**
+ * @param {WebInspector.ChunkedReader} reader
+ */
onChunkTransferred: function(reader)
{
if (this._progress.isCanceled()) {
@@ -351,11 +354,14 @@
}
},
- onTransferFinished: function(reader)
+ onTransferFinished: function()
{
this._progress.done();
},
+ /**
+ * @param {WebInspector.ChunkedReader} reader
+ */
onError: function(reader, event)
{
this._progress.done();
