| OLD | NEW | 
|   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 |  | 
|  19 #define GrPoint     SkPoint |  | 
|  20 #define GrVec       SkVector |  | 
|  21 #endif |  | 
|  22  |  | 
|  23 struct GrIPoint16 { |  18 struct GrIPoint16 { | 
|  24     int16_t fX, fY; |  19     int16_t fX, fY; | 
|  25  |  20  | 
 |  21     static GrIPoint16 Make(intptr_t x, intptr_t y) { | 
 |  22         GrIPoint16 pt; | 
 |  23         pt.set(x, y); | 
 |  24         return pt; | 
 |  25     } | 
 |  26  | 
 |  27     int16_t x() const { return fX; } | 
 |  28     int16_t y() const { return fY; } | 
 |  29  | 
|  26     void set(intptr_t x, intptr_t y) { |  30     void set(intptr_t x, intptr_t y) { | 
|  27         fX = SkToS16(x); |  31         fX = SkToS16(x); | 
|  28         fY = SkToS16(y); |  32         fY = SkToS16(y); | 
|  29     } |  33     } | 
|  30 }; |  34 }; | 
|  31  |  35  | 
|  32 #endif |  36 #endif | 
| OLD | NEW |