| OLD | NEW | 
|     1  |     1  | 
|     2 /* |     2 /* | 
|     3  * Copyright 2011 Google Inc. |     3  * Copyright 2011 Google Inc. | 
|     4  * |     4  * | 
|     5  * Use of this source code is governed by a BSD-style license that can be |     5  * Use of this source code is governed by a BSD-style license that can be | 
|     6  * found in the LICENSE file. |     6  * found in the LICENSE file. | 
|     7  */ |     7  */ | 
|     8 #include "SkPicturePlayback.h" |     8 #include "SkPicturePlayback.h" | 
|     9 #include "SkPictureRecord.h" |     9 #include "SkPictureRecord.h" | 
|    10 #include "SkTypeface.h" |    10 #include "SkTypeface.h" | 
| (...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   829                 const SkPoint& loc = reader.skipT<SkPoint>(); |   829                 const SkPoint& loc = reader.skipT<SkPoint>(); | 
|   830                 canvas.drawBitmap(bitmap, loc.fX, loc.fY, paint); |   830                 canvas.drawBitmap(bitmap, loc.fX, loc.fY, paint); | 
|   831             } break; |   831             } break; | 
|   832             case DRAW_BITMAP_RECT_TO_RECT: { |   832             case DRAW_BITMAP_RECT_TO_RECT: { | 
|   833                 const SkPaint* paint = getPaint(reader); |   833                 const SkPaint* paint = getPaint(reader); | 
|   834                 const SkBitmap& bitmap = getBitmap(reader); |   834                 const SkBitmap& bitmap = getBitmap(reader); | 
|   835                 const SkRect* src = this->getRectPtr(reader);   // may be null |   835                 const SkRect* src = this->getRectPtr(reader);   // may be null | 
|   836                 const SkRect& dst = reader.skipT<SkRect>();     // required |   836                 const SkRect& dst = reader.skipT<SkRect>();     // required | 
|   837                 SkCanvas::DrawBitmapRectFlags flags; |   837                 SkCanvas::DrawBitmapRectFlags flags; | 
|   838 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TO
      O |   838 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TO
      O | 
|   839                 flags = SkCanvas::kNone_DrawBitmapRectflag; |   839                 flags = SkCanvas::kNone_DrawBitmapRectFlag; | 
|   840                 // TODO: remove this backwards compatibility code once the .skps
       are |   840                 // TODO: remove this backwards compatibility code once the .skps
       are | 
|   841                 // regenerated |   841                 // regenerated | 
|   842                 SkASSERT(32 == size || 48 == size ||    // old sizes |   842                 SkASSERT(32 == size || 48 == size ||    // old sizes | 
|   843                          36 == size || 52 == size);     // new sizes |   843                          36 == size || 52 == size);     // new sizes | 
|   844                 if (36 == size || 52 == size) { |   844                 if (36 == size || 52 == size) { | 
|   845 #endif |   845 #endif | 
|   846                     flags = (SkCanvas::DrawBitmapRectFlags) reader.readInt(); |   846                     flags = (SkCanvas::DrawBitmapRectFlags) reader.readInt(); | 
|   847 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TO
      O |   847 #ifndef DELETE_THIS_CODE_WHEN_SKPS_ARE_REBUILT_AT_V13_AND_ALL_OTHER_INSTANCES_TO
      O | 
|   848                 } |   848                 } | 
|   849 #endif |   849 #endif | 
| (...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1622     for (index = 0; index < fRegionCount; index++) |  1622     for (index = 0; index < fRegionCount; index++) | 
|  1623         bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer
      ), |  1623         bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer
      ), | 
|  1624             "region%p, ", &fRegions[index]); |  1624             "region%p, ", &fRegions[index]); | 
|  1625     if (fRegionCount > 0) |  1625     if (fRegionCount > 0) | 
|  1626         SkDebugf("%s0};\n", pBuffer); |  1626         SkDebugf("%s0};\n", pBuffer); | 
|  1627  |  1627  | 
|  1628     const_cast<SkPicturePlayback*>(this)->dumpStream(); |  1628     const_cast<SkPicturePlayback*>(this)->dumpStream(); | 
|  1629 } |  1629 } | 
|  1630  |  1630  | 
|  1631 #endif |  1631 #endif | 
| OLD | NEW |