merge DVF-2960-marker-fill-fix

Author: chernetsky

src/vector/Element.js

@@ -1091,13 +1091,21 @@ acgraph.vector.Element.prototype.render = function() {
       this.drag(this.draggable_);
   }
 
+  this.beforeRenderInternal();
+
   this.renderInternal();
 
   this.isRendering_ = false;
   return this;
 };
 
 
+/**
+ * Before render internal hook.
+ */
+acgraph.vector.Element.prototype.beforeRenderInternal = function() {};
+
+
 /**
  * Renders element properties supposing DOM is created.
  * @protected

src/vector/PathBase.js

@@ -516,12 +516,12 @@ acgraph.vector.PathBase.prototype.moveToInternal = function(x, y) {
   this.arguments_.push(x, y);
   this.currentPoint_ = this.closePoint_ = [x, y];
 
-  // A flag is set, indicating that data is not synchronized
-  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
-
   // Borders cache is not reset as there is no extension for the time being and borders do not change
   this.transformedPathCache_ = null;
 
+  // A flag is set, indicating that data is not synchronized
+  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
+
   return this;
 };
 
@@ -550,13 +550,13 @@ acgraph.vector.PathBase.prototype.lineToInternal = function(x, y, var_args) {
   this.count_[this.count_.length - 1] += i / 2;
   this.currentPoint_ = [x, y];
 
-  // A flag is set, indicating that data is not synchronized
-  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
-
   // Caches are reset
   this.dropBoundsCache();
   this.transformedPathCache_ = null;
 
+  // A flag is set, indicating that data is not synchronized
+  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
+
   return this;
 };
 
@@ -591,13 +591,13 @@ acgraph.vector.PathBase.prototype.curveToInternal = function(control1X, control1
   this.count_[this.count_.length - 1] += i / 6;
   this.currentPoint_ = [x, y];
 
-  // A flag is set, indicating that data is not synchronized
-  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
-
   // Caches are reset
   this.dropBoundsCache();
   this.transformedPathCache_ = null;
 
+  // A flag is set, indicating that data is not synchronized
+  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
+
   return this;
 };
 
@@ -773,13 +773,13 @@ acgraph.vector.PathBase.prototype.arcToInternal = function(rx, ry, fromAngle, ex
   this.simple_ = false;
   this.currentPoint_ = [ex, ey];
 
-  // A flag is set, indicating that data is not synchronized
-  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
-
   // Caches are reset
   this.dropBoundsCache();
   this.transformedPathCache_ = null;
 
+  // A flag is set, indicating that data is not synchronized
+  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
+
   return this;
 };
 
@@ -803,13 +803,13 @@ acgraph.vector.PathBase.prototype.arcToAsCurvesInternal = function(rx, ry, fromA
 
   this.curveToInternal.apply(this, curveParams);
 
-  // A flag is set, indicating that data is not synchronized
-  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
-
   // Caches are reset
   this.dropBoundsCache();
   this.transformedPathCache_ = null;
 
+  // A flag is set, indicating that data is not synchronized
+  this.setDirtyState(acgraph.vector.Element.DirtyState.DATA);
+
   return this;
 };
 

src/vector/Shape.js

@@ -145,14 +145,18 @@ acgraph.vector.Shape.prototype.strokeThickness = function(opt_value) {
 //
 //----------------------------------------------------------------------------------------------------------------------
 /** @inheritDoc */
-acgraph.vector.Shape.prototype.renderInternal = function() {
+acgraph.vector.Shape.prototype.beforeRenderInternal = function() {
   if (this.boundsAffectedColors_ && this.hasDirtyState(acgraph.vector.Element.DirtyState.DATA)) {
     if (!!(this.boundsAffectedColors_ & 1))
       this.setDirtyState(acgraph.vector.Element.DirtyState.FILL);
     if (!!(this.boundsAffectedColors_ & 2))
       this.setDirtyState(acgraph.vector.Element.DirtyState.STROKE);
   }
+};
+
 
+/** @inheritDoc */
+acgraph.vector.Shape.prototype.renderInternal = function() {
   goog.base(this, 'renderInternal');
 
   // Apply stroke and fill settings if they were changed