Revert of Support pixel antialising in DirectWrite. (patchset #4 id:60001 of https://codereview.chromium.org/2065833002/ )

Reason for revert:
Moving to the new glyph run analysis changes things anyway, and the Chromium Win 10 bots are having issues with this. Revert until I have time to make the suppression wider.

Original issue's description:
> Support pixel antialising in DirectWrite.
>
> DirectWrite2 supports pixel antialiasing and rendering without hinting.
>
> BUG=skia:5416
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2065833002
>
> TBR=reed
> Will move SkTScopedComPtr into src.
>
> Committed: https://skia.googlesource.com/skia/+/bd770d619553a88eeaa64ff29082f62db5c9b4d2

TBR=reed@google.com,mtklein@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:5416

Review-Url: https://codereview.chromium.org/2075913002

1 files changed, 5 insertions, 6 deletions

diff --git a/include/utils/win/SkTScopedComPtr.h b/include/utils/win/SkTScopedComPtr.h
index 58bf8733a4..6fb6143adc 100644
--- a/include/utils/win/SkTScopedComPtr.h
+++ b/include/utils/win/SkTScopedComPtr.h
@@ -37,11 +37,11 @@ private:
     T *fPtr;
 
 public:
-    explicit SkTScopedComPtr(T *ptr = nullptr) : fPtr(ptr) { }
+    explicit SkTScopedComPtr(T *ptr = NULL) : fPtr(ptr) { }
     ~SkTScopedComPtr() {
         this->reset();
     }
-    T &operator*() const { SkASSERT(fPtr != nullptr); return *fPtr; }
+    T &operator*() const { SkASSERT(fPtr != NULL); return *fPtr; }
     SkBlockComRef<T> *operator->() const {
         return static_cast<SkBlockComRef<T>*>(fPtr);
     }
@@ -51,13 +51,12 @@ public:
      * Must only be used on instances currently pointing to NULL,
      * and only to initialize the instance.
      */
-    T **operator&() { SkASSERT(fPtr == nullptr); return &fPtr; }
-    explicit operator bool() const { return fPtr != nullptr; }
+    T **operator&() { SkASSERT(fPtr == NULL); return &fPtr; }
     T *get() const { return fPtr; }
     void reset() {
         if (this->fPtr) {
             this->fPtr->Release();
-            this->fPtr = nullptr;
+            this->fPtr = NULL;
         }
     }
 
@@ -69,7 +68,7 @@ public:
 
     T* release() {
         T* temp = this->fPtr;
-        this->fPtr = nullptr;
+        this->fPtr = NULL;
         return temp;
     }
 };