remove cruft from SkTypes.h, including SkBool

src/pipe/SkGPipeRead.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBitmapHeap.h"
@@ skipping 66 matching lines @@
         default:
             SkDEBUGFAIL("never gets here");
     }
 }
 
 template <typename T> class SkRefCntTDArray : public SkTDArray<T> {
 public:
     ~SkRefCntTDArray() { this->unrefAll(); }
 };
 
+static inline uint32_t set_clear_mask(uint32_t bits, bool cond, uint32_t mask) {
+    return cond ? bits | mask : bits & ~mask;
+}
+
 class SkGPipeState : public SkBitmapHeapReader {
 public:
     SkGPipeState();
     ~SkGPipeState();
 
     void setSilent(bool silent) {
         fSilent = silent;
     }
 
     bool shouldDraw() {
@@ skipping 109 matching lines @@
     const SkImage* getImage(int32_t slot) const {
         return fImageHeap->get(slot);
     }
 
 private:
     void updateReader() {
         if (nullptr == fReader) {
             return;
         }
         bool crossProcess = SkToBool(fFlags & SkGPipeWriter::kCrossProcess_Flag);
-        fReader->setFlags(SkSetClearMask(fReader->getFlags(), crossProcess,
+        fReader->setFlags(set_clear_mask(fReader->getFlags(), crossProcess,
                                          SkReadBuffer::kCrossProcess_Flag));
         if (crossProcess) {
             fReader->setFactoryArray(&fFactoryArray);
         } else {
             fReader->setFactoryArray(nullptr);
         }
 
         if (shouldFlattenBitmaps(fFlags)) {
             fReader->setBitmapStorage(this);
         } else {
@@ skipping 769 matching lines @@
                 status = kReadAtom_Status;
                 break;
             }
     }
 
     if (bytesRead) {
         *bytesRead = reader.offset();
     }
     return status;
 }