| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "app/gfx/path.h" | 5 #include "app/gfx/path.h" |
| 6 | 6 |
| 7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
| 8 | 8 |
| 9 #include "base/scoped_ptr.h" | 9 #include "base/scoped_ptr.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 | 11 |
| 12 namespace gfx { | 12 namespace gfx { |
| 13 | 13 |
| 14 GdkRegion* Path::CreateGdkRegion() const { | 14 GdkRegion* Path::CreateNativeRegion() const { |
| 15 int point_count = getPoints(NULL, 0); | 15 int point_count = getPoints(NULL, 0); |
| 16 if (point_count <= 1) { | 16 if (point_count <= 1) { |
| 17 // NOTE: ideally this would return gdk_empty_region, but that returns a | 17 // NOTE: ideally this would return gdk_empty_region, but that returns a |
| 18 // region with nothing in it. | 18 // region with nothing in it. |
| 19 return NULL; | 19 return NULL; |
| 20 } | 20 } |
| 21 | 21 |
| 22 scoped_array<SkPoint> points(new SkPoint[point_count]); | 22 scoped_array<SkPoint> points(new SkPoint[point_count]); |
| 23 getPoints(points.get(), point_count); | 23 getPoints(points.get(), point_count); |
| 24 | 24 |
| 25 scoped_array<GdkPoint> gdk_points(new GdkPoint[point_count]); | 25 scoped_array<GdkPoint> gdk_points(new GdkPoint[point_count]); |
| 26 for (int i = 0; i < point_count; ++i) { | 26 for (int i = 0; i < point_count; ++i) { |
| 27 gdk_points[i].x = SkScalarRound(points[i].fX); | 27 gdk_points[i].x = SkScalarRound(points[i].fX); |
| 28 gdk_points[i].y = SkScalarRound(points[i].fY); | 28 gdk_points[i].y = SkScalarRound(points[i].fY); |
| 29 } | 29 } |
| 30 | 30 |
| 31 return gdk_region_polygon(gdk_points.get(), point_count, GDK_EVEN_ODD_RULE); | 31 return gdk_region_polygon(gdk_points.get(), point_count, GDK_EVEN_ODD_RULE); |
| 32 } | 32 } |
| 33 | 33 |
| 34 // static |
| 35 NativeRegion Path::IntersectRegions(NativeRegion r1, NativeRegion r2) { |
| 36 GdkRegion* copy = gdk_region_copy(r1); |
| 37 gdk_region_intersect(copy, r2); |
| 38 return copy; |
| 39 } |
| 40 |
| 41 // static |
| 42 NativeRegion Path::CombineRegions(NativeRegion r1, NativeRegion r2) { |
| 43 GdkRegion* copy = gdk_region_copy(r1); |
| 44 gdk_region_union(copy, r2); |
| 45 return copy; |
| 46 } |
| 47 |
| 48 // static |
| 49 NativeRegion Path::SubtractRegion(NativeRegion r1, NativeRegion r2) { |
| 50 GdkRegion* copy = gdk_region_copy(r1); |
| 51 gdk_region_subtract(copy, r2); |
| 52 return copy; |
| 53 } |
| 54 |
| 34 } // namespace gfx | 55 } // namespace gfx |
| OLD | NEW |