From 16047ff8528ee9d5a5b9db5b0fd9936ebdef9c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@gmail.com>
Date: Thu, 19 Dec 2013 11:41:38 +0100
Subject: [PATCH] Add getters to ol.style.Fill

---
 src/ol/render/canvas/canvasimmediate.js |  5 +++--
 src/ol/render/canvas/canvasreplay.js    |  5 +++--
 src/ol/style/circlestyle.js             |  2 +-
 src/ol/style/fillstyle.js               | 11 ++++++++++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js
index ef1c1e182a..c4c345bb95 100644
--- a/src/ol/render/canvas/canvasimmediate.js
+++ b/src/ol/render/canvas/canvasimmediate.js
@@ -378,8 +378,9 @@ ol.render.canvas.Immediate.prototype.setFillStrokeStyle =
     function(fillStyle, strokeStyle) {
   var state = this.state_;
   if (!goog.isNull(fillStyle)) {
-    state.fillStyle = ol.color.asString(!goog.isNull(fillStyle.color) ?
-        fillStyle.color : ol.render.canvas.defaultFillStyle);
+    var fillStyleColor = fillStyle.getColor();
+    state.fillStyle = ol.color.asString(!goog.isNull(fillStyleColor) ?
+        fillStyleColor : ol.render.canvas.defaultFillStyle);
   } else {
     state.fillStyle = undefined;
   }
diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js
index 4a1e46d8e2..d8e32d7e3d 100644
--- a/src/ol/render/canvas/canvasreplay.js
+++ b/src/ol/render/canvas/canvasreplay.js
@@ -1027,8 +1027,9 @@ ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyle =
   goog.asserts.assert(!goog.isNull(fillStyle) || !goog.isNull(strokeStyle));
   var state = this.state_;
   if (!goog.isNull(fillStyle)) {
-    state.fillStyle = ol.color.asString(!goog.isNull(fillStyle.color) ?
-        fillStyle.color : ol.render.canvas.defaultFillStyle);
+    var fillStyleColor = fillStyle.getColor();
+    state.fillStyle = ol.color.asString(!goog.isNull(fillStyleColor) ?
+        fillStyleColor : ol.render.canvas.defaultFillStyle);
   } else {
     state.fillStyle = undefined;
   }
diff --git a/src/ol/style/circlestyle.js b/src/ol/style/circlestyle.js
index 1b1aae667d..1735057394 100644
--- a/src/ol/style/circlestyle.js
+++ b/src/ol/style/circlestyle.js
@@ -127,7 +127,7 @@ ol.style.Circle.prototype.render_ = function() {
   context.arc(size / 2, size / 2, this.radius_, 0, 2 * Math.PI, true);
 
   if (!goog.isNull(this.fill_)) {
-    context.fillStyle = ol.color.asString(this.fill_.color);
+    context.fillStyle = ol.color.asString(this.fill_.getColor());
     context.fill();
   }
   if (!goog.isNull(this.stroke_)) {
diff --git a/src/ol/style/fillstyle.js b/src/ol/style/fillstyle.js
index 78a4ddf59e..25f59b0be0 100644
--- a/src/ol/style/fillstyle.js
+++ b/src/ol/style/fillstyle.js
@@ -13,7 +13,16 @@ ol.style.Fill = function(opt_options) {
   var options = goog.isDef(opt_options) ? opt_options : {};
 
   /**
+   * @private
    * @type {ol.Color|string}
    */
-  this.color = goog.isDef(options.color) ? options.color : null;
+  this.color_ = goog.isDef(options.color) ? options.color : null;
+};
+
+
+/**
+ * @return {ol.Color|string} Color.
+ */
+ol.style.Fill.prototype.getColor = function() {
+  return this.color_;
 };