Index: src/gpu/GrTextStrike.cpp |
diff --git a/src/gpu/GrTextStrike.cpp b/src/gpu/GrTextStrike.cpp |
index 4b4298a96c5a6ecf12836dbe7cd1b0ccf3edd110..071c5d272486eadc77a36200e337e6bc15e19088 100644 |
--- a/src/gpu/GrTextStrike.cpp |
+++ b/src/gpu/GrTextStrike.cpp |
@@ -1,4 +1,3 @@ |
- |
/* |
* Copyright 2010 Google Inc. |
* |
@@ -6,14 +5,11 @@ |
* found in the LICENSE file. |
*/ |
- |
- |
#include "GrAtlas.h" |
#include "GrGpu.h" |
#include "GrRectanizer.h" |
#include "GrTextStrike.h" |
#include "GrTextStrike_impl.h" |
-#include "GrRect.h" |
SK_DEFINE_INST_COUNT(GrFontScaler) |
SK_DEFINE_INST_COUNT(GrKey) |
@@ -159,7 +155,7 @@ GrTextStrike::~GrTextStrike() { |
GrGlyph* GrTextStrike::generateGlyph(GrGlyph::PackedID packed, |
GrFontScaler* scaler) { |
- GrIRect bounds; |
+ SkIRect bounds; |
if (!scaler->getPackedGlyphBounds(packed, &bounds)) { |
return NULL; |
} |