diff options
| author |  robertphillips <robertphillips@google.com> | 2014-06-02 10:20:14 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-02 10:20:15 -0700 |
| commit | d537341e16524d1e22ac5e6c8b9c8f274ba1833c (patch) | |
| tree | d33b25af48d42a4e9ef93e57ab37b5aca82bbe65 /src/gpu/GrRectanizer_pow2.h | |
| parent | 78358bf624c7e7c09ffccf638c50870808d884d6 (diff) | |
Move GrIPoint16 to SkIPoint16 (and remove GrPoint.h)
R=bsalomon@google.com, reed@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/309683002
Diffstat (limited to 'src/gpu/GrRectanizer_pow2.h')
| -rw-r--r-- | src/gpu/GrRectanizer_pow2.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/GrRectanizer_pow2.h b/src/gpu/GrRectanizer_pow2.h index e9d9d02b0a..7bf2b868c0 100644 --- a/src/gpu/GrRectanizer_pow2.h +++ b/src/gpu/GrRectanizer_pow2.h @@ -9,6 +9,7 @@ #define GrRectanizer_pow2_DEFINED #include "GrRectanizer.h" +#include "SkPoint.h" // This Rectanizer quantizes the incoming rects to powers of 2. Each power // of two can have, at most, one active row/shelf. Once a row/shelf for @@ -29,7 +30,7 @@ public: sk_bzero(fRows, sizeof(fRows)); } - virtual bool addRect(int w, int h, GrIPoint16* loc) SK_OVERRIDE; + virtual bool addRect(int w, int h, SkIPoint16* loc) SK_OVERRIDE; virtual float percentFull() const SK_OVERRIDE { return fAreaSoFar / ((float)this->width() * this->height()); @@ -40,7 +41,7 @@ private: static const int kMaxExponent = 16; struct Row { - GrIPoint16 fLoc; + SkIPoint16 fLoc; // fRowHeight is actually known by this struct's position in fRows // but it is used to signal if there exists an open row of this height int fRowHeight; |