remove getter for imagegenerator factory, update test

BUG=skia:

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

1 files changed, 10 insertions, 10 deletions

diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
index 7da4d40b0c..8c9ff6a035 100644
--- a/src/core/SkImageGenerator.cpp
+++ b/src/core/SkImageGenerator.cpp
@@ -135,22 +135,22 @@ bool SkImageGenerator::onGetPixels(const SkImageInfo& info, void* dst, size_t rb
 
 #include "SkGraphics.h"
 
-static SkGraphics::ImageGeneratorFromEncodedFactory gImageGeneratorFromEncodedFactory;
-
-SkGraphics::ImageGeneratorFromEncodedFactory SkGraphics::GetImageGeneratorFromEncodedFactory() {
-    return gImageGeneratorFromEncodedFactory;
-}
-
-void SkGraphics::SetImageGeneratorFromEncodedFactory(ImageGeneratorFromEncodedFactory factory) {
-    gImageGeneratorFromEncodedFactory = factory;
+static SkGraphics::ImageGeneratorFromEncodedFactory gFactory;
+
+SkGraphics::ImageGeneratorFromEncodedFactory
+SkGraphics::SetImageGeneratorFromEncodedFactory(ImageGeneratorFromEncodedFactory factory)
+{
+    ImageGeneratorFromEncodedFactory prev = gFactory;
+    gFactory = factory;
+    return prev;
 }
 
 SkImageGenerator* SkImageGenerator::NewFromEncoded(SkData* data) {
     if (NULL == data) {
         return NULL;
     }
-    if (gImageGeneratorFromEncodedFactory) {
-        if (SkImageGenerator* generator = gImageGeneratorFromEncodedFactory(data)) {
+    if (gFactory) {
+        if (SkImageGenerator* generator = gFactory(data)) {
             return generator;
         }
     }