Switch Layer Hoisting over to SkRecord backend

src/gpu/GrRecordReplaceDraw.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrRecordReplaceDraw.h"
 #include "SkImage.h"
 #include "SkRecordDraw.h"
@@ skipping 69 matching lines @@
         SkRect query = { 0, 0, 0, 0 };
         (void)canvas->getClipBounds(&query);
 
         SkTDArray<void*> ops;
         bbh->search(query, &ops);
 
         for (int i = 0; i < ops.count(); i++) {
             if (NULL != callback && callback->abortDrawing()) {
                 return;
             }
-            ri = replacements->lookupByStart(i, &searchStart);
+            ri = replacements->lookupByStart((uintptr_t)ops[i], &searchStart);
             if (NULL != ri) {
                 draw_replacement_bitmap(ri, canvas);
 
                 while ((uintptr_t)ops[i] < ri->fStop) {
                     ++i;
                 }
                 SkASSERT((uintptr_t)ops[i] == ri->fStop);
                 continue;
             }
 
             record.visit<void>((uintptr_t)ops[i], draw);
         }
     } else {
         for (unsigned int i = 0; i < record.count(); ++i) {
             if (NULL != callback && callback->abortDrawing()) {
                 return;
             }
             ri = replacements->lookupByStart(i, &searchStart);
             if (NULL != ri) {
                 draw_replacement_bitmap(ri, canvas);
 
                 i = ri->fStop;
                 continue;
             }
 
             record.visit<void>(i, draw);
         }
     }
 }