Revert 150822 - Roll Skia DEPS to 5029 & skia.gyp changes

skia/skia.gyp

 # Copyright (c) 2012 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.
 
 {
   'targets': [
     {
       'target_name': 'skia',
       'type': '<(component)',
       'variables': {
@@ skipping 254 matching lines @@
         '../third_party/skia/src/core/SkMetaData.cpp',
         '../third_party/skia/src/core/SkOrderedReadBuffer.cpp',
         '../third_party/skia/src/core/SkOrderedWriteBuffer.cpp',
         '../third_party/skia/src/core/SkPackBits.cpp',
         '../third_party/skia/src/core/SkPaint.cpp',
         '../third_party/skia/src/core/SkPath.cpp',
         '../third_party/skia/src/core/SkPathEffect.cpp',
         '../third_party/skia/src/core/SkPathHeap.cpp',
         '../third_party/skia/src/core/SkPathHeap.h',
         '../third_party/skia/src/core/SkPathMeasure.cpp',
-        '../third_party/skia/src/core/SkPerspIter.h',
         '../third_party/skia/src/core/SkPicture.cpp',
         '../third_party/skia/src/core/SkPictureFlat.cpp',
         '../third_party/skia/src/core/SkPictureFlat.h',
         '../third_party/skia/src/core/SkPicturePlayback.cpp',
         '../third_party/skia/src/core/SkPicturePlayback.h',
         '../third_party/skia/src/core/SkPictureRecord.cpp',
         '../third_party/skia/src/core/SkPictureRecord.h',
         '../third_party/skia/src/core/SkPixelRef.cpp',
         '../third_party/skia/src/core/SkPoint.cpp',
         '../third_party/skia/src/core/SkProcSpriteBlitter.cpp',
@@ skipping 349 matching lines @@
         '../third_party/skia/include/core/SkMask.h',
         '../third_party/skia/include/core/SkMaskFilter.h',
         '../third_party/skia/include/core/SkMath.h',
         '../third_party/skia/include/core/SkMatrix.h',
         '../third_party/skia/include/core/SkOSFile.h',
         '../third_party/skia/include/core/SkPackBits.h',
         '../third_party/skia/include/core/SkPaint.h',
         '../third_party/skia/include/core/SkPath.h',
         '../third_party/skia/include/core/SkPathEffect.h',
         '../third_party/skia/include/core/SkPathMeasure.h',
+        '../third_party/skia/include/core/SkPerspIter.h',
         '../third_party/skia/include/core/SkPicture.h',
         '../third_party/skia/include/core/SkPixelRef.h',
         '../third_party/skia/include/core/SkPoint.h',
         '../third_party/skia/include/core/SkPtrRecorder.h',
         '../third_party/skia/include/core/SkRandom.h',
         '../third_party/skia/include/core/SkRasterizer.h',
         '../third_party/skia/include/core/SkReader32.h',
         '../third_party/skia/include/core/SkRect.h',
         '../third_party/skia/include/core/SkRefCnt.h',
         '../third_party/skia/include/core/SkRefDict.h',
@@ skipping 590 matching lines @@
           # targets via common.gypi.
           'cflags!': [
             '-fno-omit-frame-pointer',
           ],
           'cflags': [
             '-fomit-frame-pointer',
           ],
           'sources': [
             '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkBlitRow_opts_arm.h',
             '../third_party/skia/src/opts/opts_check_arm.cpp',
           ],
         }],
         [ 'armv7 == 1 and arm_neon == 0', {
           'sources': [
             '../third_party/skia/src/opts/memset.arm.S',
         ],
         }],
         [ 'armv7 == 1 and arm_neon == 1', {
           'sources': [
             '../third_party/skia/src/opts/memset16_neon.S',
             '../third_party/skia/src/opts/memset32_neon.S',
-            '../third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp',
             '../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
             '../third_party/skia/src/opts/SkBitmapProcState_matrix_clamp_neon.h',
             '../third_party/skia/src/opts/SkBitmapProcState_matrix_repeat_neon.h',
-            '../third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp',
         ],
         }],
         [ 'target_arch == "arm" and armv7 != 1', {
           'sources': [
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
           ],
           'sources!': [
             '../third_party/skia/src/opts/SkBlitRow_opts_arm.cpp',
           ],
         }],
@@ skipping 60 matching lines @@
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'ext/image_operations_bench.cc',
       ],
     },
   ],
 }