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

Side by Side Diff: ui/gfx/path_mac.mm

Issue 1633403002: MacViews: Add native drop shadow to dialogs on OSX < 10.10. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
OLDNEW
(Empty)
1 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
tapted 2016/01/28 05:59:21 nit: no (c)
karandeepb 2016/02/04 03:39:27 Done.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #import "ui/gfx/path_mac.h"
6
7 #import <Cocoa/Cocoa.h>
8
9 #include "third_party/skia/include/core/SkRegion.h"
10 #include "ui/gfx/path.h"
11
12 namespace {
13
14 // Convert an SkPoint to an NSPoint.
15 NSPoint GetNSPointFromSkPoint(const SkPoint& point) {
16 return NSMakePoint(point.x(), point.y());
17 }
18
19 } // namespace
20
21 namespace gfx {
22
23 NSBezierPath* CreateNSBezierPathFromSkRegion(const SkRegion& region) {
24 NSBezierPath* result = [NSBezierPath bezierPath];
25 for (SkRegion::Iterator i(region); !i.done(); i.next()) {
26 const SkIRect& rect = i.rect();
27 [result appendBezierPathWithRect:NSMakeRect(rect.x(), rect.y(),
28 rect.width(), rect.height())];
29 }
30 return result;
31 }
32
33 NSBezierPath* CreateNSBezierPathFromSkPath(const SkPath& path) {
karandeepb 2016/01/27 23:25:03 A simpler implementation like that in path_win.cc
34 NSBezierPath* result = [NSBezierPath bezierPath];
35 SkPath::RawIter iter(path);
36 SkPoint points[4];
37 SkPath::Verb verb;
38 while ((verb = iter.next(points)) != SkPath::kDone_Verb) {
39 switch (verb) {
40 case SkPath::kMove_Verb:
41 [result moveToPoint:GetNSPointFromSkPoint(points[0])];
42 break;
43 case SkPath::kLine_Verb:
44 DCHECK(NSEqualPoints([result currentPoint],
45 GetNSPointFromSkPoint(points[0])));
46 [result lineToPoint:GetNSPointFromSkPoint(points[1])];
47 break;
48 case SkPath::kQuad_Verb: {
tapted 2016/01/28 05:59:21 typically if any `case` has curlies in Chrome, all
karandeepb 2016/02/04 03:39:27 Done.
49 DCHECK(NSEqualPoints([result currentPoint],
50 GetNSPointFromSkPoint(points[0])));
51 SkPoint quad[] = {points[0], points[1], points[2]};
52 // NSBezierPath does not support quadratic bezier curves. Hence convert
53 // to cubic bezier curve.
54 SkPath::ConvertQuadToCubic(quad, points);
tapted 2016/01/28 05:59:21 Does this function exist? Maybe you modified SkPat
karandeepb 2016/02/04 03:39:27 Yeah I did modify SkPath to expose the internal sk
55 [result curveToPoint:GetNSPointFromSkPoint(points[3])
56 controlPoint1:GetNSPointFromSkPoint(points[1])
57 controlPoint2:GetNSPointFromSkPoint(points[2])];
58 break;
59 }
60 case SkPath::kCubic_Verb:
61 DCHECK(NSEqualPoints([result currentPoint],
62 GetNSPointFromSkPoint(points[0])));
63 [result curveToPoint:GetNSPointFromSkPoint(points[3])
64 controlPoint1:GetNSPointFromSkPoint(points[1])
65 controlPoint2:GetNSPointFromSkPoint(points[2])];
66 break;
67 case SkPath::kConic_Verb: {
68 DCHECK(NSEqualPoints([result currentPoint],
69 GetNSPointFromSkPoint(points[0])));
70 // Approximate with quads. Use two for now, increase if more precision
tapted 2016/01/28 05:59:21 I think we can avoid this with [NSBezierPath appen
karandeepb 2016/02/04 03:39:27 I don't think we can approximate a kConicVerb(whic
71 // is needed.
72 const size_t kPow2 = 1;
73 const size_t quadCount = 1 << kPow2;
74 SkPoint quads[1 + 2 * quadCount];
75 SkPath::ConvertConicToQuads(points[0], points[1], points[2],
76 iter.conicWeight(), quads, kPow2);
77 for (size_t i = 0; i < quadCount; i++) {
78 SkPoint quad[] = {quads[2 * i], quads[2 * i + 1], quads[2 * i + 2]};
79 SkPath::ConvertQuadToCubic(quad, points);
80 [result curveToPoint:GetNSPointFromSkPoint(points[3])
81 controlPoint1:GetNSPointFromSkPoint(points[1])
82 controlPoint2:GetNSPointFromSkPoint(points[2])];
83 }
84 break;
85 }
86 case SkPath::kClose_Verb:
87 [result closePath];
88 break;
89 default:
90 NOTREACHED();
91 }
92 }
93
94 // Set up the fill type. NSBezierCurve does not have inverse fill types.
95 if (!path.isInverseFillType()) {
tapted 2016/01/28 05:59:21 instead can we DCHECK(!path.isInverseFillType());
karandeepb 2016/02/04 03:39:27 Done.
96 switch (path.getFillType()) {
97 case SkPath::kWinding_FillType:
98 [result setWindingRule:NSNonZeroWindingRule];
99 break;
100 case SkPath::kEvenOdd_FillType:
101 [result setWindingRule:NSEvenOddWindingRule];
102 break;
103 default:
104 NOTREACHED();
105 }
106 }
107
108 return result;
109 }
110
111 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/path_mac.h ('k') | ui/gfx/path_mac_unittest.mm » ('j') | ui/gfx/path_mac_unittest.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698