Make BBH::search() const.

src/core/SkTileGrid.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTileGrid.h"
 
@@ skipping 15 matching lines @@
 }
 
 SkTileGrid::~SkTileGrid() {
     SkDELETE_ARRAY(fTileData);
 }
 
 int SkTileGrid::tileCount(int x, int y) {
     return this->tile(x, y).count();
 }
 
+const SkTDArray<void *>& SkTileGrid::tile(int x, int y) const {
+    return fTileData[y * fXTileCount + x];
+}
+
 SkTDArray<void *>& SkTileGrid::tile(int x, int y) {
     return fTileData[y * fXTileCount + x];
 }
 
 void SkTileGrid::insert(void* data, const SkIRect& bounds, bool) {
     SkASSERT(!bounds.isEmpty());
     SkIRect dilatedBounds = bounds;
     dilatedBounds.outset(fInfo.fMargin.width(), fInfo.fMargin.height());
     dilatedBounds.offset(fInfo.fOffset);
     if (!SkIRect::Intersects(dilatedBounds, fGridBounds)) {
@@ skipping 12 matching lines @@
         fYTileCount -1), 0);
 
     for (int x = minTileX; x <= maxTileX; x++) {
         for (int y = minTileY; y <= maxTileY; y++) {
             this->tile(x, y).push(data);
         }
     }
     fInsertionCount++;
 }
 
-void SkTileGrid::search(const SkIRect& query, SkTDArray<void*>* results) {
+void SkTileGrid::search(const SkIRect& query, SkTDArray<void*>* results) const {
     SkIRect adjustedQuery = query;
     // The inset is to counteract the outset that was applied in 'insert'
     // The outset/inset is to optimize for lookups of size
     // 'tileInterval + 2 * margin' that are aligned with the tile grid.
     adjustedQuery.inset(fInfo.fMargin.width(), fInfo.fMargin.height());
     adjustedQuery.offset(fInfo.fOffset);
     adjustedQuery.sort();  // in case the inset inverted the rectangle
     // Convert the query rectangle from device coordinates to tile coordinates
     // by rounding outwards to the nearest tile boundary so that the resulting tile
     // region includes the query rectangle. (using truncating division to "floor")
@@ skipping 10 matching lines @@
     tileEndY = SkPin32(tileEndY, tileStartY+1, fYTileCount);
 
     int queryTileCount = (tileEndX - tileStartX) * (tileEndY - tileStartY);
     SkASSERT(queryTileCount);
     if (queryTileCount == 1) {
         *results = this->tile(tileStartX, tileStartY);
     } else {
         results->reset();
         SkAutoSTArray<kStackAllocationTileCount, int> curPositions(queryTileCount);
         SkAutoSTArray<kStackAllocationTileCount, SkTDArray<void *>*> storage(queryTileCount);
-        SkTDArray<void *>** tileRange = storage.get();
+        const SkTDArray<void *>** tileRange = const_cast<const SkTDArray<void*>**>(storage.get());
         int tile = 0;
         for (int x = tileStartX; x < tileEndX; ++x) {
             for (int y = tileStartY; y < tileEndY; ++y) {
                 tileRange[tile] = &this->tile(x, y);
                 curPositions[tile] = tileRange[tile]->count() ? 0 : kTileFinished;
                 ++tile;
             }
         }
         void *nextElement;
         while(NULL != (nextElement = fNextDatumFunction(tileRange, curPositions))) {
@@ skipping 13 matching lines @@
 }
 
 void SkTileGrid::rewindInserts() {
     SkASSERT(fClient);
     for (int i = 0; i < fTileCount; ++i) {
         while (!fTileData[i].isEmpty() && fClient->shouldRewind(fTileData[i].top())) {
             fTileData[i].pop();
         }
     }
 }