Flush some non-substantive Ganesh changes

src/gpu/batches/GrDiscardBatch.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDiscardBatch_DEFINED
 #define GrDiscardBatch_DEFINED
 
@@ skipping 20 matching lines @@
 
     SkString dumpInfo() const override {
         SkString string;
         string.printf("RT: %d", fRenderTarget.get()->getUniqueID());
         string.append(INHERITED::dumpInfo());
         return string;
     }
 
 private:
     bool onCombineIfPossible(GrBatch* that, const GrCaps& caps) override {
-        return fRenderTarget == that->cast<GrDiscardBatch>()->fRenderTarget;
+        return this->renderTargetUniqueID() == that->renderTargetUniqueID();
     }
 
     void onPrepare(GrBatchFlushState*) override {}
 
     void onDraw(GrBatchFlushState* state) override {
         state->commandBuffer()->discard(fRenderTarget.get());
     }
 
     GrPendingIOResource<GrRenderTarget, kWrite_GrIOType> fRenderTarget;
 
     typedef GrBatch INHERITED;
 };
 
 #endif