pdfviewer: add indexed rbg image support, enhanche caching(setData) for SkPdfObject

Review URL: https://codereview.chromium.org/21738005

git-svn-id: http://skia.googlecode.com/svn/trunk@10534 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/PdfViewer/SkPdfFont.cpp b/experimental/PdfViewer/SkPdfFont.cpp
index ac96f02..5d8cfe6 100644
--- a/experimental/PdfViewer/SkPdfFont.cpp
+++ b/experimental/PdfViewer/SkPdfFont.cpp
@@ -255,10 +255,10 @@
         return NULL;  // TODO(edisonn): report default one?
     }
 
-    if (dict->data() == NULL) {
-        dict->setData(fontFromPdfDictionaryOnce(doc, dict));
+    if (!dict->hasData(SkPdfObject::kFont_Data)) {
+        dict->setData(fontFromPdfDictionaryOnce(doc, dict), SkPdfObject::kFont_Data);
     }
-    return (SkPdfFont*)dict->data();
+    return (SkPdfFont*)dict->data(SkPdfObject::kFont_Data);
 }