fix: call getTextEditorElement only once in drawDecorations

atom-minimap · Jan 2, 2021 · 94a3064 · 94a3064
1 parent 739a561
commit 94a3064
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/lib/mixins/canvas-drawer.js b/lib/mixins/canvas-drawer.js
@@ -469,6 +469,7 @@ export default class CanvasDrawer extends Mixin {
    */
   drawDecorations (screenRow, decorations, renderData, types) {
     let decorationsToRender = []
+    const editorElement = this.minimap.getTextEditorElement()
 
     renderData.context.clearRect(
       0, renderData.yRow,
@@ -487,7 +488,7 @@ export default class CanvasDrawer extends Mixin {
 
     if (decorationsToRender != null ? decorationsToRender.length : undefined) {
       for (let i = 0, len = decorationsToRender.length; i < len; i++) {
-        types[decorationsToRender[i].properties.type].call(this, decorationsToRender[i], renderData)
+        types[decorationsToRender[i].properties.type].call(this, decorationsToRender[i], renderData, editorElement)
       }
     }
   }
@@ -497,10 +498,11 @@ export default class CanvasDrawer extends Mixin {
    *
    * @param  {Decoration} decoration the decoration to render
    * @param  {Object} data the data need to perform the render
+   * @param {TextEditorElement} editorElement
    * @access private
    */
-  drawLineDecoration (decoration, data) {
-    data.context.fillStyle = this.getDecorationColor(decoration, this.minimap.getTextEditorElement())
+  drawLineDecoration (decoration, data, editorElement) {
+    data.context.fillStyle = this.getDecorationColor(decoration, editorElement)
     data.context.fillRect(0, data.yRow, data.canvasWidth, data.lineHeight)
   }
 
@@ -509,10 +511,11 @@ export default class CanvasDrawer extends Mixin {
    *
    * @param  {Decoration} decoration the decoration to render
    * @param  {Object} data the data need to perform the render
+   * @param {TextEditorElement} editorElement
    * @access private
    */
-  drawGutterDecoration (decoration, data) {
-    data.context.fillStyle = this.getDecorationColor(decoration, this.minimap.getTextEditorElement())
+  drawGutterDecoration (decoration, data, editorElement) {
+    data.context.fillStyle = this.getDecorationColor(decoration, editorElement)
     data.context.fillRect(0, data.yRow, 1, data.lineHeight)
   }
 
@@ -524,13 +527,14 @@ export default class CanvasDrawer extends Mixin {
    *
    * @param  {Decoration} decoration the decoration to render
    * @param  {Object} data the data need to perform the render
+   * @param {TextEditorElement} editorElement
    * @access private
    */
-  drawHighlightDecoration (decoration, data) {
+  drawHighlightDecoration (decoration, data, editorElement) {
     const range = decoration.getMarker().getScreenRange()
     const rowSpan = range.end.row - range.start.row
 
-    data.context.fillStyle = this.getDecorationColor(decoration, this.minimap.getTextEditorElement())
+    data.context.fillStyle = this.getDecorationColor(decoration, editorElement)
 
     if (rowSpan === 0) {
       const colSpan = range.end.column - range.start.column
@@ -553,17 +557,18 @@ export default class CanvasDrawer extends Mixin {
    *
    * @param  {Decoration} decoration the decoration to render
    * @param  {Object} data the data need to perform the render
+   * @param {TextEditorElement} editorElement
    * @access private
    */
-  drawHighlightOutlineDecoration (decoration, data) {
+  drawHighlightOutlineDecoration (decoration, data, editorElement) {
     let bottomWidth, colSpan, width, xBottomStart, xEnd, xStart
     const { lineHeight, charWidth, canvasWidth, screenRow } = data
     const range = decoration.getMarker().getScreenRange()
     const rowSpan = range.end.row - range.start.row
     const yStart = data.yRow
     const yEnd = yStart + lineHeight
 
-    data.context.fillStyle = this.getDecorationColor(decoration, this.minimap.getTextEditorElement())
+    data.context.fillStyle = this.getDecorationColor(decoration, editorElement)
 
     if (rowSpan === 0) {
       colSpan = range.end.column - range.start.column
@@ -633,14 +638,15 @@ export default class CanvasDrawer extends Mixin {
    *
    * @param  {Decoration} decoration the decoration to render
    * @param  {Object} data the data need to perform the render
+   * @param {TextEditorElement} editorElement
    * @access private
    */
-  drawCustomDecoration (decoration, data) {
+  drawCustomDecoration (decoration, data, editorElement) {
     const renderRoutine = decoration.getProperties().render
 
     if (renderRoutine) {
-      data.color = this.getDecorationColor(decoration, this.minimap.getTextEditorElement())
-      renderRoutine(decoration, data)
+      data.color = this.getDecorationColor(decoration, editorElement)
+      renderRoutine(decoration, data, editorElement)
     }
   }
 }