Rename flag from "distance field" to "device independent."

include/core/SkSurfaceProps.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkSurfaceProps_DEFINED
 #define SkSurfaceProps_DEFINED
 
@@ skipping 33 matching lines @@
 }
 
 /**
  *  Describes properties and constraints of a given SkSurface. The rendering engine can parse these
  *  during drawing, and can sometimes optimize its performance (e.g. disabling an expensive
  *  feature).
  */
 class SK_API SkSurfaceProps {
 public:
     enum Flags {
-        kDisallowAntiAlias_Flag     = 1 << 0,
-        kDisallowDither_Flag        = 1 << 1,
-        kUseDistanceFieldFonts_Flag = 1 << 2,
+        kDisallowAntiAlias_Flag         = 1 << 0,
+        kDisallowDither_Flag            = 1 << 1,
+        kUseDeviceIndependentFonts_Flag = 1 << 2,
     };
+    /** Deprecated alias used by Chromium. Will be removed. */
+    static const Flags kUseDistanceFieldFonts_Flag = kUseDeviceIndependentFonts_Flag;
+
     SkSurfaceProps(uint32_t flags, SkPixelGeometry);
 
     enum InitType {
         kLegacyFontHost_InitType
     };
     SkSurfaceProps(InitType);
     SkSurfaceProps(uint32_t flags, InitType);
     SkSurfaceProps(const SkSurfaceProps& other);
 
     uint32_t flags() const { return fFlags; }
     SkPixelGeometry pixelGeometry() const { return fPixelGeometry; }
 
     bool isDisallowAA() const { return SkToBool(fFlags & kDisallowAntiAlias_Flag); }
     bool isDisallowDither() const { return SkToBool(fFlags & kDisallowDither_Flag); }
-    bool isUseDistanceFieldFonts() const { return SkToBool(fFlags & kUseDistanceFieldFonts_Flag); }
+    bool isUseDeviceIndependentFonts() const {
+        return SkToBool(fFlags & kUseDeviceIndependentFonts_Flag);
+    }
 
 private:
     SkSurfaceProps();
 
     uint32_t        fFlags;
     SkPixelGeometry fPixelGeometry;
 };
 
 #endif