use SkTDynamicHash in picture recording

src/core/SkPictureRecord.cpp

Index: src/core/SkPictureRecord.cpp
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index 915736373d0aba5df1ac3116a09607984a006811..c2707ddfeeff77029e64551a2558f6cee4870bf6 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -400,16 +400,13 @@ static bool merge_savelayer_paint_into_drawbitmp(SkWriter32* writer,
                                    SkColorGetA(saveLayerPaint->getColor()));
     dbmPaint->setColor(newColor);
 
-    const SkFlatData* data = paintDict->findAndReturnFlat(*dbmPaint);
-    if (NULL == data) {
-        return false;
-    }
+    const int paintIndex = paintDict->find(*dbmPaint);
 
     // kill the saveLayer and alter the DBMR2R's paint to be the modified one
     convert_command_to_noop(writer, saveLayerInfo.fOffset);
     uint32_t* ptr = writer->peek32(dbmInfo.fOffset+dbmPaintOffset);
     SkASSERT(dbmPaintId == *ptr);
-    *ptr = data->index();
+    *ptr = paintIndex;
     return true;
 }