Revert of Support pixel antialising in DirectWrite.

src/ports/SkTypeface_win_dw.h

Index: src/ports/SkTypeface_win_dw.h
diff --git a/src/ports/SkTypeface_win_dw.h b/src/ports/SkTypeface_win_dw.h
index 4d1767ba2f803a3e66c2f2466249f1e57a0da527..11b3fb5ffc573326acaa133f8286db7acea57cc9 100644
--- a/src/ports/SkTypeface_win_dw.h
+++ b/src/ports/SkTypeface_win_dw.h
@@ -19,9 +19,6 @@
 #include <dwrite.h>
 #if SK_HAS_DWRITE_1_H
 #  include <dwrite_1.h>
-#endif
-#if SK_HAS_DWRITE_2_H
-#  include <dwrite_2.h>
 #endif
 
 class SkFontDescriptor;
@@ -64,23 +61,10 @@
             SkASSERT_RELEASE(nullptr == fDWriteFontFace1.get());
         }
 #endif
-#if SK_HAS_DWRITE_2_H
-        if (!SUCCEEDED(fDWriteFontFace->QueryInterface(&fDWriteFontFace2))) {
-            SkASSERT_RELEASE(nullptr == fDWriteFontFace2.get());
-        }
-        if (!SUCCEEDED(fFactory->QueryInterface(&fFactory2))) {
-            SkASSERT_RELEASE(nullptr == fFactory2.get());
-        }
-#endif
     }
 
 public:
     SkTScopedComPtr<IDWriteFactory> fFactory;
-#if SK_HAS_DWRITE_2_H
-    SkTScopedComPtr<IDWriteFactory2> fFactory2;
-#else
-    const decltype(nullptr) fFactory2 = nullptr;
-#endif
     SkTScopedComPtr<IDWriteFontCollectionLoader> fDWriteFontCollectionLoader;
     SkTScopedComPtr<IDWriteFontFileLoader> fDWriteFontFileLoader;
     SkTScopedComPtr<IDWriteFontFamily> fDWriteFontFamily;
@@ -88,11 +72,6 @@
     SkTScopedComPtr<IDWriteFontFace> fDWriteFontFace;
 #if SK_HAS_DWRITE_1_H
     SkTScopedComPtr<IDWriteFontFace1> fDWriteFontFace1;
-#endif
-#if SK_HAS_DWRITE_2_H
-    SkTScopedComPtr<IDWriteFontFace2> fDWriteFontFace2;
-#else
-    const decltype(nullptr) fDWriteFontFace2 = nullptr;
 #endif
 
     static DWriteFontTypeface* Create(IDWriteFactory* factory,