Revert of Enable flattening of SkRecordedDrawable

src/core/SkPicturePlayback.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 "SkCanvas.h"
 #include "SkPatchUtils.h"
 #include "SkPictureData.h"
@@ skipping 239 matching lines @@
         } break;
         case DRAW_CLEAR:
             canvas->clear(reader->readInt());
             break;
         case DRAW_DATA: {
             // This opcode is now dead, just need to skip it for backwards compatibility
             size_t length = reader->readInt();
             (void)reader->skip(length);
             // skip handles padding the read out to a multiple of 4
         } break;
-        case DRAW_DRAWABLE:
-            canvas->drawDrawable(fPictureData->getDrawable(reader));
-            break;
-        case DRAW_DRAWABLE_MATRIX: {
-            SkMatrix matrix;
-            reader->readMatrix(&matrix);
-            SkDrawable* drawable = fPictureData->getDrawable(reader);
-            canvas->drawDrawable(drawable, &matrix);
-        } break;
         case DRAW_DRRECT: {
             const SkPaint& paint = *fPictureData->getPaint(reader);
             SkRRect outer, inner;
             reader->readRRect(&outer);
             reader->readRRect(&inner);
             canvas->drawDRRect(outer, inner, paint);
         } break;
         case BEGIN_COMMENT_GROUP: {
             SkString tmp;
             reader->readString(&tmp);
@@ skipping 290 matching lines @@
         } break;
         case TRANSLATE: {
             SkScalar dx = reader->readScalar();
             SkScalar dy = reader->readScalar();
             canvas->translate(dx, dy);
         } break;
         default:
             SkASSERTF(false, "Unknown draw type: %d", op);
     }
 }