Changed to a class based method in passing around the rendering method for render_pictures.

This is based on a comment for https://codereview.appspot.com/6427061/

Review URL: https://codereview.appspot.com/6405080

git-svn-id: http://skia.googlecode.com/svn/trunk@4786 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 47ab49a..2ab422f 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -70,8 +70,6 @@
       'type': 'executable',
       'sources': [
         '../tools/render_pictures_main.cpp',
-        '../src/pipe/utils/SamplePipeControllers.h',
-        '../src/pipe/utils/SamplePipeControllers.cpp',
       ],
       'include_dirs': [
         '../src/pipe/utils/',
@@ -80,6 +78,7 @@
         'core.gyp:core',
         'images.gyp:images',
         'ports.gyp:ports',
+        'tools.gyp:PictureRenderer',
         'tools.gyp:picture_utils',
       ],
     },
@@ -104,6 +103,22 @@
       ],
     },
     {
+     'target_name': 'PictureRenderer',
+     'type': 'static_library',
+     'sources': [
+        '../tools/PictureRenderer.cpp',
+        '../src/pipe/utils/SamplePipeControllers.h',
+        '../src/pipe/utils/SamplePipeControllers.cpp',
+     ],
+      'include_dirs': [
+        '../src/pipe/utils/',
+      ],
+     'dependencies': [
+        'core.gyp:core',
+        'tools.gyp:picture_utils',
+     ],
+    },
+    {
       'target_name': 'picture_utils',
       'type': 'static_library',
       'sources': [