reland "extract some common code from PictureRenderer"

gyp/tools.gyp

 # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
@@ skipping 163 matching lines @@
         '../tools/skimage_main.cpp',
       ],
       'include_dirs': [
         # For SkBitmapHasher.h
         '../src/utils/',
       ],
       'dependencies': [
         'flags.gyp:flags',
         'gm.gyp:gm_expectations',
         'jsoncpp.gyp:jsoncpp',
         'skia_lib.gyp:skia_lib',

[epoger, 2014/05/08 20:17:14]

Fixed multiple places where this dependency should not have been.

-        'utils.gyp:utils',
       ],
     },
     {
       'target_name': 'skpinfo',
       'type': 'executable',
       'sources': [
         '../tools/skpinfo.cpp',
       ],
       'include_dirs': [
         '../tools/flags',
@@ skipping 34 matching lines @@
         '../src/gpu/',
         '../src/core/',
       ],
       'dependencies': [
         'effects.gyp:effects',
         'images.gyp:images',
         'lua.gyp:lua',
         'pdf.gyp:pdf',
         'ports.gyp:ports',
         'skia_lib.gyp:skia_lib',
-        'utils.gyp:utils',
       ],
     },
     {
       'target_name': 'lua_pictures',
       'type': 'executable',
       'sources': [
         '../tools/lua/lua_pictures.cpp',
         '../src/utils/SkLuaCanvas.cpp',
         '../src/utils/SkLua.cpp',
       ],
       'include_dirs': [
         # Lua exposes GrReduceClip which in turn requires src/core for SkTLList
         '../src/gpu/',
         '../src/core/',
       ],
       'dependencies': [
         'effects.gyp:effects',
         'flags.gyp:flags',
         'images.gyp:images',
         'lua.gyp:lua',
         'tools.gyp:picture_renderer',
         'tools.gyp:picture_utils',
         'pdf.gyp:pdf',
         'ports.gyp:ports',
         'skia_lib.gyp:skia_lib',
-        'utils.gyp:utils',
       ],
     },
     {
       'target_name': 'render_pictures',
       'type': 'executable',
       'sources': [
         '../tools/render_pictures_main.cpp',
       ],
       'include_dirs': [
         '../src/core',
@@ skipping 85 matching lines @@
       'dependencies': [
         'flags.gyp:flags',
         'record.gyp:*',
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
       'target_name': 'picture_renderer',
       'type': 'static_library',
       'sources': [
+        '../tools/image_expectations.h',
+        '../tools/image_expectations.cpp',
         '../tools/LazyDecodeBitmap.cpp',
         '../tools/PictureRenderer.h',
         '../tools/PictureRenderer.cpp',
         '../tools/PictureRenderingFlags.h',
         '../tools/PictureRenderingFlags.cpp',
         '../tools/CopyTilesRenderer.h',
         '../tools/CopyTilesRenderer.cpp',
         '../src/pipe/utils/SamplePipeControllers.h',
         '../src/pipe/utils/SamplePipeControllers.cpp',
       ],
       'include_dirs': [
         '../src/core',
         '../src/images',
         '../src/lazy',
         '../src/pipe/utils/',
         '../src/utils/',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          # needed for JSON headers used within PictureRenderer.h
+          # needed for JSON headers used within image_expectations.h
           '../third_party/externals/jsoncpp-chromium/overrides/include/',
           '../third_party/externals/jsoncpp/include/',
         ],
       },
       'dependencies': [
         'flags.gyp:flags',
         'jsoncpp.gyp:jsoncpp',
         'skia_lib.gyp:skia_lib',
         'tools.gyp:picture_utils',
       ],
@@ skipping 210 matching lines @@
             'type': 'executable',
             'sources': [
               '../tools/win_lcid.cpp',
             ],
           },
         ],
       },
     ],
   ],
 }