Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(921)

Unified Diff: ui/gfx/path_win.cc

Issue 169223002: Revert of Fix CreateHRGNFromSkPath to support arbitrary SkPaths. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/gfx/path_win_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/path_win.cc
diff --git a/ui/gfx/path_win.cc b/ui/gfx/path_win.cc
index 2588e811c12dcc239ba81bd6a233a42581a01705..b28ea7a2c7bf02e99a501c4f9351d199fe6beed5 100644
--- a/ui/gfx/path_win.cc
+++ b/ui/gfx/path_win.cc
@@ -25,10 +25,16 @@
}
HRGN CreateHRGNFromSkPath(const SkPath& path) {
- SkRegion clip(SkIRect::MakeLTRB(INT_MIN, INT_MIN, INT_MAX, INT_MAX));
- SkRegion region;
- region.setPath(path, clip);
- return CreateHRGNFromSkRegion(region);
+ int point_count = path.getPoints(NULL, 0);
+ scoped_ptr<SkPoint[]> points(new SkPoint[point_count]);
+ path.getPoints(points.get(), point_count);
+ scoped_ptr<POINT[]> windows_points(new POINT[point_count]);
+ for (int i = 0; i < point_count; ++i) {
+ windows_points[i].x = SkScalarRoundToInt(points[i].fX);
+ windows_points[i].y = SkScalarRoundToInt(points[i].fY);
+ }
+
+ return ::CreatePolygonRgn(windows_points.get(), point_count, ALTERNATE);
}
// See path_aura.cc for Aura definition of these methods:
« no previous file with comments | « no previous file | ui/gfx/path_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698