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

Side by Side Diff: ui/gfx/path_win.cc

Issue 673623002: Fix regions generation on windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add more tests. Fix windows without mask. Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/gfx/path_win.h" 5 #include "ui/gfx/path_win.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/win/scoped_gdi_object.h" 8 #include "base/win/scoped_gdi_object.h"
9 #include "third_party/skia/include/core/SkRegion.h" 9 #include "third_party/skia/include/core/SkRegion.h"
10 #include "ui/gfx/path.h" 10 #include "ui/gfx/path.h"
11 11
12 namespace gfx { 12 namespace gfx {
13 13
14 HRGN CreateHRGNFromSkRegion(const SkRegion& region) { 14 HRGN CreateHRGNFromSkRegion(const SkRegion& region) {
15 base::win::ScopedRegion temp(::CreateRectRgn(0, 0, 0, 0)); 15 base::win::ScopedRegion temp(::CreateRectRgn(0, 0, 0, 0));
16 base::win::ScopedRegion result(::CreateRectRgn(0, 0, 0, 0)); 16 base::win::ScopedRegion result(::CreateRectRgn(0, 0, 0, 0));
17 17
18 for (SkRegion::Iterator i(region); !i.done(); i.next()) { 18 for (SkRegion::Iterator i(region); !i.done(); i.next()) {
19 const SkIRect& rect = i.rect(); 19 const SkIRect& rect = i.rect();
20 ::SetRectRgn(temp, rect.left(), rect.top(), rect.right(), rect.bottom()); 20 ::SetRectRgn(temp, rect.left(), rect.top(), rect.right(), rect.bottom());
21 ::CombineRgn(result, result, temp, RGN_OR); 21 ::CombineRgn(result, result, temp, RGN_OR);
22 } 22 }
23 23
24 return result.release(); 24 return result.release();
25 } 25 }
26 26
27 HRGN CreateHRGNFromSkPath(const SkPath& path) { 27 HRGN CreateHRGNFromSkPath(const SkPath& path) {
28 int point_count = path.getPoints(NULL, 0); 28 SkRegion clip_region;
29 scoped_ptr<SkPoint[]> points(new SkPoint[point_count]); 29 clip_region.setRect(path.getBounds().round());
30 path.getPoints(points.get(), point_count); 30 SkRegion region;
31 scoped_ptr<POINT[]> windows_points(new POINT[point_count]); 31 if (region.setPath(path, clip_region))
32 for (int i = 0; i < point_count; ++i) { 32 return NULL;
33 windows_points[i].x = SkScalarRoundToInt(points[i].fX); 33 return CreateHRGNFromSkRegion(region);
34 windows_points[i].y = SkScalarRoundToInt(points[i].fY);
35 }
36
37 return ::CreatePolygonRgn(windows_points.get(), point_count, ALTERNATE);
38 } 34 }
39 35
40 // See path_aura.cc for Aura definition of these methods: 36 // See path_aura.cc for Aura definition of these methods:
41 #if !defined(USE_AURA) 37 #if !defined(USE_AURA)
42 38
43 NativeRegion Path::CreateNativeRegion() const { 39 NativeRegion Path::CreateNativeRegion() const {
44 return CreateHRGNFromSkPath(*this); 40 return CreateHRGNFromSkPath(*this);
45 } 41 }
46 42
47 // static 43 // static
(...skipping 13 matching lines...) Expand all
61 // static 57 // static
62 NativeRegion Path::SubtractRegion(NativeRegion r1, NativeRegion r2) { 58 NativeRegion Path::SubtractRegion(NativeRegion r1, NativeRegion r2) {
63 HRGN dest = CreateRectRgn(0, 0, 1, 1); 59 HRGN dest = CreateRectRgn(0, 0, 1, 1);
64 CombineRgn(dest, r1, r2, RGN_DIFF); 60 CombineRgn(dest, r1, r2, RGN_DIFF);
65 return dest; 61 return dest;
66 } 62 }
67 63
68 #endif 64 #endif
69 65
70 } // namespace gfx 66 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/gfx_tests.gyp ('k') | ui/gfx/path_win_unittest.cc » ('j') | ui/gfx/path_win_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698