Remove use of goog.dispose()

This commit is contained in:
Tim Schaub
2016-03-01 23:35:22 -07:00
parent df4f154a93
commit ae4d8195c0
25 changed files with 65 additions and 86 deletions

View File

@@ -70,7 +70,7 @@ ol.ImageTile.prototype.disposeInternal = function() {
this.unlistenImage_();
}
if (this.interimTile) {
goog.dispose(this.interimTile);
this.interimTile.dispose();
}
goog.base(this, 'disposeInternal');
};

View File

@@ -285,7 +285,7 @@ ol.MapBrowserEventHandler.prototype.handlePointerUp_ = function(pointerEvent) {
this.dragListenerKeys_.length = 0;
this.dragging_ = false;
this.down_ = null;
goog.dispose(this.documentPointerEventHandler_);
this.documentPointerEventHandler_.dispose();
this.documentPointerEventHandler_ = null;
}
};
@@ -416,11 +416,11 @@ ol.MapBrowserEventHandler.prototype.disposeInternal = function() {
this.dragListenerKeys_.length = 0;
if (this.documentPointerEventHandler_) {
goog.dispose(this.documentPointerEventHandler_);
this.documentPointerEventHandler_.dispose();
this.documentPointerEventHandler_ = null;
}
if (this.pointerEventHandler_) {
goog.dispose(this.pointerEventHandler_);
this.pointerEventHandler_.dispose();
this.pointerEventHandler_ = null;
}
goog.base(this, 'disposeInternal');

View File

@@ -257,8 +257,6 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame = function(frameState, lay
return true;
}
// FIXME dispose of old replayGroup in post render
goog.dispose(this.replayGroup_);
this.replayGroup_ = null;
this.dirty_ = false;

View File

@@ -216,8 +216,6 @@ ol.renderer.canvas.VectorTileLayer.prototype.createReplayGroup = function(tile,
return;
}
// FIXME dispose of old replayGroup in post render
goog.dispose(replayState.replayGroup);
replayState.replayGroup = null;
replayState.dirty = false;

View File

@@ -268,8 +268,6 @@ ol.renderer.dom.VectorLayer.prototype.prepareFrame = function(frameState, layerS
return true;
}
// FIXME dispose of old replayGroup in post render
goog.dispose(this.replayGroup_);
this.replayGroup_ = null;
this.dirty_ = false;

View File

@@ -3,7 +3,6 @@ goog.provide('ol.renderer.Map');
goog.require('goog.Disposable');
goog.require('goog.asserts');
goog.require('goog.dispose');
goog.require('goog.functions');
goog.require('goog.vec.Mat4');
goog.require('ol');
@@ -95,7 +94,7 @@ ol.renderer.Map.prototype.createLayerRenderer = goog.abstractMethod;
*/
ol.renderer.Map.prototype.disposeInternal = function() {
for (var id in this.layerRenderers_) {
goog.dispose(this.layerRenderers_[id]);
this.layerRenderers_[id].dispose();
}
goog.base(this, 'disposeInternal');
};
@@ -340,7 +339,7 @@ ol.renderer.Map.prototype.removeUnusedLayerRenderers_ = function(map, frameState
var layerKey;
for (layerKey in this.layerRenderers_) {
if (!frameState || !(layerKey in frameState.layerStates)) {
goog.dispose(this.removeLayerRendererByKey_(layerKey));
this.removeLayerRendererByKey_(layerKey).dispose();
}
}
};

View File

@@ -311,7 +311,7 @@ ol.renderer.webgl.Map.prototype.disposeInternal = function() {
}
});
}
goog.dispose(this.context_);
this.context_.dispose();
goog.base(this, 'disposeInternal');
};