commit fcf7829b67b798aff4c41c4688daa9c7381991e6
author robertphillips <robertphillips@google.com> Fri Jun 19 11:49:52 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Jun 19 11:49:52 2015 -0700
tree f19261a4bfcee389dec33fa28698b0737edcd5dc
parent 97c595f304567abac00dbe4fa6ea9b4d8bf5d89f

remove SkDeviceProperties

There is a lot more clean up to do here but this is probably a big enough bite.

Review URL: https://codereview.chromium.org/1196683003

src/gpu/GrTextContext.cpp

diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index 5559b2d..9032858 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -21,10 +21,10 @@
 #include "SkTextToPathIter.h"
 
 GrTextContext::GrTextContext(GrContext* context, GrDrawContext* drawContext,
-                             const SkDeviceProperties& properties)
+                             const SkSurfaceProps& surfaceProps)
     : fFallbackTextContext(NULL)
     , fContext(context)
-    , fDeviceProperties(properties)
+    , fSurfaceProps(surfaceProps)
     , fDrawContext(drawContext) {
 }
 
@@ -108,14 +108,14 @@
     return false;
 }
 
-uint32_t GrTextContext::FilterTextFlags(const SkDeviceProperties& devProps, const SkPaint& paint) {
+uint32_t GrTextContext::FilterTextFlags(const SkSurfaceProps& surfaceProps, const SkPaint& paint) {
     uint32_t flags = paint.getFlags();
 
     if (!paint.isLCDRenderText() || !paint.isAntiAlias()) {
         return flags;
     }
 
-    if (kUnknown_SkPixelGeometry == devProps.pixelGeometry() || ShouldDisableLCD(paint)) {
+    if (kUnknown_SkPixelGeometry == surfaceProps.pixelGeometry() || ShouldDisableLCD(paint)) {
         flags &= ~SkPaint::kLCDRenderText_Flag;
         flags |= SkPaint::kGenA8FromLCD_Flag;
     }
@@ -144,7 +144,7 @@
             continue;
         }
 
-        runPaint.setFlags(FilterTextFlags(fDeviceProperties, runPaint));
+        runPaint.setFlags(FilterTextFlags(fSurfaceProps, runPaint));
 
         GrPaint grPaint;
         if (!SkPaint2GrPaint(fContext, fRenderTarget, runPaint, viewMatrix, true, &grPaint)) {