Replace op== with CombineIfPossible in GrDrawState.

src/gpu/GrInOrderDrawBuffer.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrInOrderDrawBuffer_DEFINED
 #define GrInOrderDrawBuffer_DEFINED
 
@@ skipping 183 matching lines @@
 
     bool quickInsideClip(const SkRect& devBounds);
 
     virtual void didAddGpuTraceMarker() SK_OVERRIDE {}
     virtual void didRemoveGpuTraceMarker() SK_OVERRIDE {}
 
     // Attempts to concat instances from info onto the previous draw. info must represent an
     // instanced draw. The caller must have already recorded a new draw state and clip if necessary.
     int concatInstancedDraw(const DrawInfo& info);
 
-    // we lazily record state and clip changes in order to skip clips and states that have no
-    // effect.
-    bool needsNewState() const;
+    // Determines whether the current draw operation requieres a new drawstate and if so records it.
+    void recordStateIfNecessary();
+    // We lazily record clip changes in order to skip clips that have no effect.
     bool needsNewClip() const;
 
     // these functions record a command
     void            recordState();
     void            recordClip();
     DrawRecord*     recordDraw(const DrawInfo&);
     StencilPath*    recordStencilPath();
     DrawPath*       recordDrawPath();
     DrawPaths*      recordDrawPaths();
     Clear*          recordClear();
@@ skipping 68 matching lines @@
 
     void addToCmdBuffer(uint8_t cmd);
 
     bool                            fFlushing;
     uint32_t                        fDrawID;
 
     typedef GrDrawTarget INHERITED;
 };
 
 #endif