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

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

Issue 909183002: win/aura: Remove some more non-aura code for Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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 unified diff | Download patch
« no previous file with comments | « printing/printing_context_win.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 14 matching lines...) Expand all
25 } 25 }
26 26
27 HRGN CreateHRGNFromSkPath(const SkPath& path) { 27 HRGN CreateHRGNFromSkPath(const SkPath& path) {
28 SkRegion clip_region; 28 SkRegion clip_region;
29 clip_region.setRect(path.getBounds().round()); 29 clip_region.setRect(path.getBounds().round());
30 SkRegion region; 30 SkRegion region;
31 region.setPath(path, clip_region); 31 region.setPath(path, clip_region);
32 return CreateHRGNFromSkRegion(region); 32 return CreateHRGNFromSkRegion(region);
33 } 33 }
34 34
35 // See path_aura.cc for Aura definition of these methods:
36 #if !defined(USE_AURA)
37
38 NativeRegion Path::CreateNativeRegion() const {
39 return CreateHRGNFromSkPath(*this);
40 }
41
42 // static
43 NativeRegion Path::IntersectRegions(NativeRegion r1, NativeRegion r2) {
44 HRGN dest = CreateRectRgn(0, 0, 1, 1);
45 CombineRgn(dest, r1, r2, RGN_AND);
46 return dest;
47 }
48
49 // static
50 NativeRegion Path::CombineRegions(NativeRegion r1, NativeRegion r2) {
51 HRGN dest = CreateRectRgn(0, 0, 1, 1);
52 CombineRgn(dest, r1, r2, RGN_OR);
53 return dest;
54 }
55
56 // static
57 NativeRegion Path::SubtractRegion(NativeRegion r1, NativeRegion r2) {
58 HRGN dest = CreateRectRgn(0, 0, 1, 1);
59 CombineRgn(dest, r1, r2, RGN_DIFF);
60 return dest;
61 }
62
63 #endif
64
65 } // namespace gfx 35 } // namespace gfx
OLDNEW
« no previous file with comments | « printing/printing_context_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698