From b33ceaa400a8c72920df71f9a67562da80483f82 Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Tue, 19 Mar 2019 13:57:10 +0100
Subject: [PATCH 1/2] More efficient default fill color

---
 src/ol/render/canvas.js                | 4 ++--
 src/ol/render/canvas/PolygonBuilder.js | 7 +++----
 src/ol/style/RegularShape.js           | 3 +--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/ol/render/canvas.js b/src/ol/render/canvas.js
index 3c2607cae0..a3a42d656e 100644
--- a/src/ol/render/canvas.js
+++ b/src/ol/render/canvas.js
@@ -85,9 +85,9 @@ export const defaultFont = '10px sans-serif';
 
 /**
  * @const
- * @type {import("../color.js").Color}
+ * @type {import("../colorlike.js").ColorLike}
  */
-export const defaultFillStyle = [0, 0, 0, 1];
+export const defaultFillStyle = '#000';
 
 
 /**
diff --git a/src/ol/render/canvas/PolygonBuilder.js b/src/ol/render/canvas/PolygonBuilder.js
index 46f1a2a298..0c67a6c903 100644
--- a/src/ol/render/canvas/PolygonBuilder.js
+++ b/src/ol/render/canvas/PolygonBuilder.js
@@ -1,7 +1,6 @@
 /**
  * @module ol/render/canvas/PolygonBuilder
  */
-import {asString} from '../../color.js';
 import {snap} from '../../geom/flat/simplify.js';
 import {defaultFillStyle} from '../canvas.js';
 import CanvasInstruction, {
@@ -77,7 +76,7 @@ class CanvasPolygonBuilder extends CanvasBuilder {
     if (state.fillStyle !== undefined) {
       this.hitDetectionInstructions.push([
         CanvasInstruction.SET_FILL_STYLE,
-        asString(defaultFillStyle)
+        defaultFillStyle
       ]);
     }
     if (state.strokeStyle !== undefined) {
@@ -121,7 +120,7 @@ class CanvasPolygonBuilder extends CanvasBuilder {
     if (state.fillStyle !== undefined) {
       this.hitDetectionInstructions.push([
         CanvasInstruction.SET_FILL_STYLE,
-        asString(defaultFillStyle)
+        defaultFillStyle
       ]);
     }
     if (state.strokeStyle !== undefined) {
@@ -153,7 +152,7 @@ class CanvasPolygonBuilder extends CanvasBuilder {
     if (state.fillStyle !== undefined) {
       this.hitDetectionInstructions.push([
         CanvasInstruction.SET_FILL_STYLE,
-        asString(defaultFillStyle)
+        defaultFillStyle
       ]);
     }
     if (state.strokeStyle !== undefined) {
diff --git a/src/ol/style/RegularShape.js b/src/ol/style/RegularShape.js
index c06f85d976..d8dd972151 100644
--- a/src/ol/style/RegularShape.js
+++ b/src/ol/style/RegularShape.js
@@ -2,7 +2,6 @@
  * @module ol/style/RegularShape
  */
 
-import {asString} from '../color.js';
 import {asColorLike} from '../colorlike.js';
 import {createCanvasContext2D} from '../dom.js';
 import ImageState from '../ImageState.js';
@@ -482,7 +481,7 @@ class RegularShape extends ImageStyle {
       }
     }
 
-    context.fillStyle = asString(defaultFillStyle);
+    context.fillStyle = defaultFillStyle;
     context.fill();
     if (this.stroke_) {
       context.strokeStyle = renderOptions.strokeStyle;

From b06c84cef91ec0c45f3763e02eed9d784c61b23c Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Tue, 19 Mar 2019 13:58:20 +0100
Subject: [PATCH 2/2] More efficient default stroke style

---
 src/ol/render/canvas.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ol/render/canvas.js b/src/ol/render/canvas.js
index a3a42d656e..3e55f4216f 100644
--- a/src/ol/render/canvas.js
+++ b/src/ol/render/canvas.js
@@ -127,9 +127,9 @@ export const defaultMiterLimit = 10;
 
 /**
  * @const
- * @type {import("../color.js").Color}
+ * @type {import("../colorlike.js").ColorLike}
  */
-export const defaultStrokeStyle = [0, 0, 0, 1];
+export const defaultStrokeStyle = '#000';
 
 
 /**