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

Side by Side Diff: include/gpu/GrPoint.h

Issue 216503004: SK_SUPPORT_LEGACY_GRTYPES to hide duplicate types from SkTypes.h (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « include/gpu/GrGlyph.h ('k') | include/gpu/GrTexture.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2010 Google Inc. 3 * Copyright 2010 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 10
11 #ifndef GrPoint_DEFINED 11 #ifndef GrPoint_DEFINED
12 #define GrPoint_DEFINED 12 #define GrPoint_DEFINED
13 13
14 #include "GrTypes.h" 14 #include "GrTypes.h"
15 #include "SkScalar.h" 15 #include "SkScalar.h"
16 #include "SkPoint.h" 16 #include "SkPoint.h"
17 17
18 #if 0
bsalomon 2014/03/28 15:13:39 Can we just delete this?
18 #define GrPoint SkPoint 19 #define GrPoint SkPoint
19 #define GrVec SkVector 20 #define GrVec SkVector
21 #endif
20 22
21 struct GrIPoint16 { 23 struct GrIPoint16 {
22 int16_t fX, fY; 24 int16_t fX, fY;
23 25
24 void set(intptr_t x, intptr_t y) { 26 void set(intptr_t x, intptr_t y) {
25 fX = GrToS16(x); 27 fX = SkToS16(x);
26 fY = GrToS16(y); 28 fY = SkToS16(y);
27 } 29 }
28 }; 30 };
29 31
30 #endif 32 #endif
OLDNEW
« no previous file with comments | « include/gpu/GrGlyph.h ('k') | include/gpu/GrTexture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698