diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-21 22:27:02 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-21 22:27:02 +0000 |
| commit | 99357798be13331add27405986066dc7d82d3d29 (patch) | |
| tree | 7182c51915846227cb8798702e8d13c5d65a156a | |
| parent | 4b4f3015239b868acdf4fc1241a9b1e66c936003 (diff) | |
| parent | 148dc93c45b72f210b443735166f69cf2b5d0fd8 (diff) | |
| download | gyp-99357798be13331add27405986066dc7d82d3d29.tar.gz | |
Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at 148dc93c45b72f210b443735166f69cf2b5d0fd8
This commit was generated by merge_from_chromium.py.
Change-Id: I0458019a7c76d906f2fee772cbd3d01ff83bd18c
| -rw-r--r-- | animator.gyp | 4 | ||||
| -rw-r--r-- | common_conditions.gypi | 5 | ||||
| -rw-r--r-- | core.gypi | 6 | ||||
| -rw-r--r-- | skia_for_chromium_defines.gypi | 4 |
4 files changed, 17 insertions, 2 deletions
diff --git a/animator.gyp b/animator.gyp index 06603ba..c4ade17 100644 --- a/animator.gyp +++ b/animator.gyp @@ -149,8 +149,8 @@ '../src/animator/SkOperand2.h', '../src/animator/SkOperandInterpolator.h', '../src/animator/SkOperandIterpolator.cpp', - '../src/animator/SkPaintParts.cpp', - '../src/animator/SkPaintParts.h', + '../src/animator/SkPaintPart.cpp', + '../src/animator/SkPaintPart.h', '../src/animator/SkParseSVGPath.cpp', '../src/animator/SkPathParts.cpp', '../src/animator/SkPathParts.h', diff --git a/common_conditions.gypi b/common_conditions.gypi index 9f77c7d..f312df9 100644 --- a/common_conditions.gypi +++ b/common_conditions.gypi @@ -295,6 +295,11 @@ 'SK_SUPPORT_LEGACY_GETTOTALCLIP', # Still need to switch Android to the new name for N32. 'kNative_8888_SkColorType kN32_SkColorType', + 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', + 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', + 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', + 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', + 'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS', ], }], @@ -13,6 +13,7 @@ '<(skia_src_path)/core/SkAdvancedTypefaceMetrics.cpp', '<(skia_src_path)/core/SkAlphaRuns.cpp', '<(skia_src_path)/core/SkAntiRun.h', + '<(skia_src_path)/core/SkBBHFactory.cpp', '<(skia_src_path)/core/SkBBoxHierarchy.h', '<(skia_src_path)/core/SkBBoxRecord.cpp', '<(skia_src_path)/core/SkBBoxRecord.h', @@ -133,6 +134,7 @@ '<(skia_src_path)/core/SkPicturePlayback.h', '<(skia_src_path)/core/SkPictureRecord.cpp', '<(skia_src_path)/core/SkPictureRecord.h', + '<(skia_src_path)/core/SkPictureRecorder.cpp', '<(skia_src_path)/core/SkPictureShader.cpp', '<(skia_src_path)/core/SkPictureShader.h', '<(skia_src_path)/core/SkPictureStateTree.cpp', @@ -158,6 +160,7 @@ '<(skia_src_path)/core/SkRRect.cpp', '<(skia_src_path)/core/SkRTree.h', '<(skia_src_path)/core/SkRTree.cpp', + '<(skia_src_path)/core/SkRTreePicture.cpp', '<(skia_src_path)/core/SkScaledImageCache.cpp', '<(skia_src_path)/core/SkScalar.cpp', '<(skia_src_path)/core/SkScalerContext.cpp', @@ -218,6 +221,7 @@ '<(skia_src_path)/pipe/SkGPipeWrite.cpp', '<(skia_include_path)/core/SkAdvancedTypefaceMetrics.h', + '<(skia_include_path)/core/SkBBHFactory.h', '<(skia_include_path)/core/SkBitmap.h', '<(skia_include_path)/core/SkBitmapDevice.h', '<(skia_include_path)/core/SkBlitRow.h', @@ -270,6 +274,7 @@ '<(skia_include_path)/core/SkPathMeasure.h', '<(skia_include_path)/core/SkPathRef.h', '<(skia_include_path)/core/SkPicture.h', + '<(skia_include_path)/core/SkPictureRecorder.h', '<(skia_include_path)/core/SkPixelRef.h', '<(skia_include_path)/core/SkPoint.h', '<(skia_include_path)/core/SkPreConfig.h', @@ -279,6 +284,7 @@ '<(skia_include_path)/core/SkRefCnt.h', '<(skia_include_path)/core/SkRegion.h', '<(skia_include_path)/core/SkRRect.h', + '<(skia_include_path)/core/SkRTreePicture.h', '<(skia_include_path)/core/SkScalar.h', '<(skia_include_path)/core/SkShader.h', '<(skia_include_path)/core/SkStream.h', diff --git a/skia_for_chromium_defines.gypi b/skia_for_chromium_defines.gypi index c555214..affd807 100644 --- a/skia_for_chromium_defines.gypi +++ b/skia_for_chromium_defines.gypi @@ -16,7 +16,11 @@ 'SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1', 'SK_SUPPORT_LEGACY_GETTOPDEVICE', 'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD', + 'SK_SUPPORT_DEPRECATED_RECORD_FLAGS', + 'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES', 'SK_SUPPORT_LEGACY_N32_NAME', + 'SK_SUPPORT_LEGACY_PROCXFERMODE', + 'SK_SUPPORT_LEGACY_PICTURE_HEADERS', ], }, } |