Switch AwPixelInfo to wrap SkCanvasLayerState

skia/skia_library.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 the Skia library.
 # In component mode (shared_lib) it is folded into a single shared library with
 # the Chrome-specific enhancements but in all other cases it is a separate lib.
 {
   'dependencies': [
@@ skipping 105 matching lines @@
     '../third_party/skia/src/utils/debugger/SkDebugCanvas.h',
     '../third_party/skia/src/utils/debugger/SkDrawCommand.cpp',
     '../third_party/skia/src/utils/debugger/SkDrawCommand.h',
     '../third_party/skia/src/utils/debugger/SkObjectParser.cpp',
     '../third_party/skia/src/utils/debugger/SkObjectParser.h',
     '../third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp',
     '../third_party/skia/src/utils/SkBase64.cpp',
     '../third_party/skia/src/utils/SkBase64.h',
     '../third_party/skia/src/utils/SkBitSet.cpp',
     '../third_party/skia/src/utils/SkBitSet.h',
+    '../third_party/skia/src/utils/SkCanvasStack.cpp',
+    '../third_party/skia/src/utils/SkCanvasStateUtils.cpp',
     '../third_party/skia/src/utils/SkDeferredCanvas.cpp',
     '../third_party/skia/src/utils/SkMatrix44.cpp',
     '../third_party/skia/src/utils/SkNullCanvas.cpp',
     '../third_party/skia/include/utils/SkNWayCanvas.h',
     '../third_party/skia/src/utils/SkNWayCanvas.cpp',
     '../third_party/skia/src/utils/SkPictureUtils.cpp',
     '../third_party/skia/src/utils/SkProxyCanvas.cpp',
     '../third_party/skia/src/utils/SkRTConf.cpp',
     '../third_party/skia/include/utils/SkRTConf.h',
     '../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp',
@@ skipping 326 matching lines @@
       '../third_party/skia/include/pathops',
       '../third_party/skia/include/pipe',
       '../third_party/skia/include/ports',
       '../third_party/skia/include/utils',
     ],
     'defines': [
       '<@(skia_export_defines)',
     ],
   },
 }