cc: Gather and lock/unlock SkDiscardablePixelRefs instead of skia::LazyPixelRefs.

skia/skia_chrome.gypi

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # This gypi file contains all the Chrome-specific enhancements to Skia.
 # In component mode (shared_lib) it is folded into a single shared library with
 # the Skia files but in all other cases it is a separate library.
 {
   'dependencies': [
@@ skipping 23 matching lines @@
     'ext/bitmap_platform_device_skia.h',
     'ext/bitmap_platform_device_win.cc',
     'ext/bitmap_platform_device_win.h',
     'ext/convolver.cc',
     'ext/convolver.h',
     'ext/google_logging.cc',
     'ext/image_operations.cc',
     'ext/image_operations.h',
     'ext/lazy_pixel_ref.cc',
     'ext/lazy_pixel_ref.h',
-    'ext/lazy_pixel_ref_utils.cc',
-    'ext/lazy_pixel_ref_utils.h',
     'ext/opacity_draw_filter.cc',
     'ext/opacity_draw_filter.h',
     'ext/paint_simplifier.cc',
     'ext/paint_simplifier.h',
+    'ext/pixel_ref_utils.cc',
+    'ext/pixel_ref_utils.h',
     'ext/platform_canvas.cc',
     'ext/platform_canvas.h',
     'ext/platform_device.cc',
     'ext/platform_device.h',
     'ext/platform_device_linux.cc',
     'ext/platform_device_mac.cc',
     'ext/platform_device_win.cc',
     'ext/recursive_gaussian_convolution.cc',
     'ext/recursive_gaussian_convolution.h',
     'ext/refptr.h',
@@ skipping 57 matching lines @@
   'target_conditions': [
     # Pull in specific linux files for android (which have been filtered out
     # by file name rules).
     [ 'OS == "android"', {
       'sources/': [
         ['include', 'ext/platform_device_linux\\.cc$'],
       ],
     }],
   ],
 }