github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 23:08:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace decorationCountsByLayerId with a map keyed by layer

Browse Source
This commit is contained in:
Nathan Sobo
2017-03-03 05:56:27 -07:00
committed by Antonio Scandurra
parent 18acf8bb19
commit a1faf66a85
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/decoration-manager.js
View File

@@ -12,7 +12,7 @@ class DecorationManager {
this.decorationsByMarker = new Map()
this.overlayDecorations = new Set()
this.layerDecorationsByMarkerLayer = new Map()
this.decorationCountsByLayerId = {}
this.decorationCountsByLayer = new Map()
this.layerUpdateDisposablesByLayerId = {}
}
@@ -87,9 +87,8 @@ class DecorationManager {
decorationsForScreenRowRange (startScreenRow, endScreenRow) {
const decorationsByMarkerId = {}
for (let layerId in this.decorationCountsByLayerId) {
const layer = this.displayLayer.getMarkerLayer(layerId)
for (let marker of layer.findMarkers({intersectsScreenRowRange: [startScreenRow, endScreenRow]})) {
for (const layer of this.decorationCountsByLayer.keys()) {
for (const marker of layer.findMarkers({intersectsScreenRowRange: [startScreenRow, endScreenRow]})) {
const decorations = this.decorationsByMarker.get(marker)
if (decorations) {
decorationsByMarkerId[marker.id] = decorations
@@ -102,10 +101,8 @@ class DecorationManager {
decorationsStateForScreenRowRange (startScreenRow, endScreenRow) {
const decorationsState = {}
for (let layerId in this.decorationCountsByLayerId) {
const layer = this.displayLayer.getMarkerLayer(layerId)
for (let marker of layer.findMarkers({intersectsScreenRowRange: [startScreenRow, endScreenRow]})) {
for (const layer of this.decorationCountsByLayer.keys()) {
for (const marker of layer.findMarkers({intersectsScreenRowRange: [startScreenRow, endScreenRow]})) {
if (marker.isValid()) {
const screenRange = marker.getScreenRange()
const bufferRange = marker.getBufferRange()
@@ -234,19 +231,21 @@ class DecorationManager {
}
observeDecoratedLayer (layer) {
if (this.decorationCountsByLayerId[layer.id] == null) {
this.decorationCountsByLayerId[layer.id] = 0
}
if (++this.decorationCountsByLayerId[layer.id] === 1) {
const newCount = (this.decorationCountsByLayer.get(layer) || 0) + 1
this.decorationCountsByLayer.set(layer, newCount)
if (newCount === 1) {
this.layerUpdateDisposablesByLayerId[layer.id] = layer.onDidUpdate(this.emitDidUpdateDecorations.bind(this))
}
}
unobserveDecoratedLayer (layer) {
if (--this.decorationCountsByLayerId[layer.id] === 0) {
const newCount = this.decorationCountsByLayer.get(layer) - 1
if (newCount === 0) {
this.layerUpdateDisposablesByLayerId[layer.id].dispose()
delete this.decorationCountsByLayerId[layer.id]
this.decorationCountsByLayer.delete(layer)
delete this.layerUpdateDisposablesByLayerId[layer.id]
} else {
this.decorationCountsByLayer.set(layer, newCount)
}
}
}