Quickfix for incorrect PICTURE_MATRIX_PAINT & PATCH optimization.

src/core/SkPictureRecord.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPictureRecord.h"
 #include "SkBBoxHierarchy.h"
 #include "SkDevice.h"
@@ skipping 439 matching lines @@
     if (kSaveLayerWithBoundsSize == result[0].fSize) {
         // The saveLayer's bound can offset where the dbm is drawn
         return false;
     }
 
     return merge_savelayer_paint_into_drawbitmp(writer, paintDict,
                                                 result[0], result[3]);
 }
 
 static bool is_drawing_op(DrawType op) {
-    return (op > CONCAT && op < ROTATE) || DRAW_DRRECT == op;
+
+    // FIXME: yuck. convert to a lookup table?
+    return (op > CONCAT && op < ROTATE)
+            || DRAW_DRRECT == op
+            || DRAW_PATCH == op
+            || DRAW_PICTURE_MATRIX_PAINT == op;
 }
 
 /*
  *  Restore has just been called (but not recorded), so look back at the
  *  matching save(), and see if we can eliminate the pair of them, due to no
  *  intervening matrix/clip calls.
  *
  *  If so, update the writer and return true, in which case we won't even record
  *  the restore() call. If we still need the restore(), return false.
  */
@@ skipping 1042 matching lines @@
 }
 
 void SkPictureRecord::addText(const void* text, size_t byteLength) {
     fContentInfo.onDrawText();
     addInt(SkToInt(byteLength));
     fWriter.writePad(text, byteLength);
 }
 
 ///////////////////////////////////////////////////////////////////////////////