Rename shapeBounds to bounds for generic

adobe-research · Mar 18, 2015 · dddb21b · dddb21b
1 parent 146478e
commit dddb21b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/svgOMGeneratorImage.js b/svgOMGeneratorImage.js
@@ -35,13 +35,13 @@
         this.addImage = function (svgNode, layer, writer) {
             return this.pathComponentOrigin(layer, function (pixel) {
                 svgNode.pixel = pixel;
-                svgNode.shapeBounds = layer.bounds;
+                svgNode.bounds = layer.bounds;
 
                 if (layer.boundsWithFX) {
-                    svgNode.shapeBounds = layer.boundsWithFX;
+                    svgNode.bounds = layer.boundsWithFX;
                 }
 
-                omgStyles.addStylingData(svgNode, layer, svgNode.shapeBounds, writer);
+                omgStyles.addStylingData(svgNode, layer, svgNode.bounds, writer);
 
                 return true;
             });

diff --git a/svgWriterTag.js b/svgWriterTag.js
@@ -427,13 +427,13 @@
             return tag.useTrick(ctx);
         },
         generic: function (ctx, node) {
-            if (!node.shapeBounds) {
+            if (!node.bounds) {
                 return;
             }
-            var top = parseFloat(node.shapeBounds.top),
-                right = parseFloat(node.shapeBounds.right),
-                bottom = parseFloat(node.shapeBounds.bottom),
-                left = parseFloat(node.shapeBounds.left),
+            var top = parseFloat(node.bounds.top),
+                right = parseFloat(node.bounds.right),
+                bottom = parseFloat(node.bounds.bottom),
+                left = parseFloat(node.bounds.left),
                 w = right - left,
                 h = bottom - top,
                 tag = new Tag("image", {

diff --git a/tests/data/pixelImage-fx-om.js b/tests/data/pixelImage-fx-om.js
@@ -22,7 +22,7 @@ module.exports = {
 				"right": 100
 			},
 			"pixel": "data:img/png;base64,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",
-			"shapeBounds": {
+			"bounds": {
 				"top": 0,
 				"left": 0,
 				"bottom": 100,

diff --git a/tests/data/pixelImage-linked-om.js b/tests/data/pixelImage-linked-om.js
@@ -16,7 +16,7 @@ module.exports = {
 			"children": [],
 			"title": "green",
 			"pixel": "data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkAQMAAABKLAcXAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABlBMVEUAfwAAAADe5c7RAAAAAWJLR0QB/wIt3gAAAAlwSFlzAAALEgAACxIB0t1+/AAAABRJREFUOMtjYBgFo2AUjIJRQE8AAAV4AAEpcbn8AAAAAElFTkSuQmCC",
-			"shapeBounds": {
+			"bounds": {
 				"top": 0,
 				"left": 0,
 				"bottom": 100,

diff --git a/tests/data/pixelImage-om.js b/tests/data/pixelImage-om.js
@@ -16,7 +16,7 @@ module.exports = {
 			"children": [],
 			"title": "green",
 			"pixel": "data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkAQMAAABKLAcXAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABlBMVEUAfwAAAADe5c7RAAAAAWJLR0QB/wIt3gAAAAlwSFlzAAALEgAACxIB0t1+/AAAABRJREFUOMtjYBgFo2AUjIJRQE8AAAV4AAEpcbn8AAAAAElFTkSuQmCC",
-			"shapeBounds": {
+			"bounds": {
 				"top": 0,
 				"left": 0,
 				"bottom": 100,