src/utils/SkBitSet: simplify

src/pdf/SkPDFMakeCIDGlyphWidthsArray.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitSet.h"
 #include "SkPDFMakeCIDGlyphWidthsArray.h"
 #include "SkPaint.h"
@@ skipping 153 matching lines @@
     bool prevRange = false;
 
     int16_t lastAdvance = kInvalidAdvance;
     int repeatedAdvances = 0;
     int wildCardsInRun = 0;
     int trailingWildCards = 0;
 
     // Limit the loop count to glyph id ranges provided.
     int lastIndex = num_glyphs;
     if (subset) {
-        while (!subset->isBitSet(lastIndex - 1) && lastIndex > 0) {
+        while (!subset->has(lastIndex - 1) && lastIndex > 0) {
             --lastIndex;
         }
     }
     AdvanceMetric curRange(0);
 
     for (int gId = 0; gId <= lastIndex; gId++) {
         int16_t advance = kInvalidAdvance;
         if (gId < lastIndex) {
-            if (!subset || 0 == gId || subset->isBitSet(gId)) {
+            if (!subset || 0 == gId || subset->has(gId)) {
                 advance = (int16_t)cache->getGlyphIDAdvance(gId).fAdvanceX;
             } else {
                 advance = kDontCareAdvance;
             }
         }
         if (advance == lastAdvance) {
             repeatedAdvances++;
             trailingWildCards = 0;
         } else if (advance == kDontCareAdvance) {
             wildCardsInRun++;
@@ skipping 59 matching lines @@
     if (curRange.fStartId == lastIndex) {
         if (!prevRange) {
             return nullptr;  // https://crbug.com/567031
         }
     } else {
         finish_range(&curRange, lastIndex - 1, AdvanceMetric::kRange);
         compose_advance_data(curRange, emSize, defaultAdvance, result.get());
     }
     return result;
 }