summaryrefslogtreecommitdiffstats
path: root/o3d/samples
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 22:50:04 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-07 22:50:04 +0000
commit30839bd931ee2e32cb4bab8c5afd2649eb00e634 (patch)
tree6cbf6c1ba49c8e162c08fc13d9bde308379bda74 /o3d/samples
parent97c2c0304fcda75890b4490ca5e6d569db30ca6d (diff)
downloadchromium_src-30839bd931ee2e32cb4bab8c5afd2649eb00e634.zip
chromium_src-30839bd931ee2e32cb4bab8c5afd2649eb00e634.tar.gz
chromium_src-30839bd931ee2e32cb4bab8c5afd2649eb00e634.tar.bz2
Made code which determines which side of contours to fill more robust
using new outgoing "ambiguous" parameter added to Skia XRay queries. Rolled forward Skia dependency to latest revision. With these changes the SVG butterfly renders correctly in O3D. Boosted polygon offsets again to avoid pixel dropouts. Also tested O3D canvas demos to verify no breakage with Skia roll-forward. BUG=none TEST=none Review URL: http://codereview.chromium.org/2813049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples')
-rw-r--r--o3d/samples/gpu2d/svg_butterfly.html2
-rw-r--r--o3d/samples/gpu2d/svgloader.js2
2 files changed, 1 insertions, 3 deletions
diff --git a/o3d/samples/gpu2d/svg_butterfly.html b/o3d/samples/gpu2d/svg_butterfly.html
index b473e38..0cd4182 100644
--- a/o3d/samples/gpu2d/svg_butterfly.html
+++ b/o3d/samples/gpu2d/svg_butterfly.html
@@ -48,7 +48,5 @@ SVG Butterfly
<div id="o3d" style="width: 1280px; height: 1024px;"></div>
<!-- End of O3D plugin -->
-(There are currently still rendering errors in the above.)
-
</body>
</html>
diff --git a/o3d/samples/gpu2d/svgloader.js b/o3d/samples/gpu2d/svgloader.js
index b01352c..46e4506 100644
--- a/o3d/samples/gpu2d/svgloader.js
+++ b/o3d/samples/gpu2d/svgloader.js
@@ -335,7 +335,7 @@ SVGLoader.prototype.parsePath_ = function(pathData,
if (this.fill_) {
path.setFill(this.fill_);
}
- path.setPolygonOffset(-2 * this.polygonOffset_, -3 * this.polygonOffset_);
+ path.setPolygonOffset(-3 * this.polygonOffset_, -4 * this.polygonOffset_);
++this.polygonOffset_;
this.currentTransform_().addShape(path.shape);
};