diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-22 02:55:59 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-22 02:55:59 +0000 |
| commit | 3339ac54a5ed75f2872ab16e9052a8b9ff3564bf (patch) | |
| tree | 42852098db6117ad0f15cf332bc2aacffa322e38 /gyp | |
| parent | 8991c67f0c1b9364bb12dfb0f32a53bd5a3357f3 (diff) | |
Revert of Remove unused (by clients) SkUnitMapper (https://codereview.chromium.org/283273002/) (https://codereview.chromium.org/288343009/)
Reason for revert:
required blink change failed to land
Original issue's description:
> Remove unused (by clients) SkUnitMapper (https://codereview.chromium.org/283273002/)
>
> This reverts commit dd50c83b5b34dab3a077741861b50ed1f2bc6b8f.
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14830
R=scroggo@google.com, reed@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/296823008
git-svn-id: http://skia.googlecode.com/svn/trunk@14838 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/SampleApp.gyp | 2 | ||||
| -rw-r--r-- | gyp/core.gypi | 1 | ||||
| -rw-r--r-- | gyp/public_headers.gypi | 2 | ||||
| -rw-r--r-- | gyp/skia_for_chromium_defines.gypi | 1 | ||||
| -rw-r--r-- | gyp/utils.gyp | 2 |
5 files changed, 8 insertions, 0 deletions
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp index 3eb735f74b..edcba1078e 100644 --- a/gyp/SampleApp.gyp +++ b/gyp/SampleApp.gyp @@ -106,6 +106,7 @@ '../samplecode/SampleTextureDomain.cpp', '../samplecode/SampleTiling.cpp', '../samplecode/SampleTinyBitmap.cpp', + '../samplecode/SampleUnitMapper.cpp', '../samplecode/SampleUnpremul.cpp', '../samplecode/SampleVertices.cpp', '../samplecode/SampleXfermodesBlur.cpp', @@ -272,6 +273,7 @@ [ 'skia_os == "android"', { 'sources!': [ '../samplecode/SampleAnimator.cpp', + '../samplecode/SampleUnitMapper.cpp', ], 'dependencies!': [ 'animator.gyp:animator', diff --git a/gyp/core.gypi b/gyp/core.gypi index c5d3b0069f..46764328c7 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -307,6 +307,7 @@ '<(skia_include_path)/core/SkTypeface.h', '<(skia_include_path)/core/SkTypes.h', '<(skia_include_path)/core/SkUnPreMultiply.h', + '<(skia_include_path)/core/SkUnitMapper.h', '<(skia_include_path)/core/SkUtils.h', '<(skia_include_path)/core/SkWeakRefCnt.h', '<(skia_include_path)/core/SkWriter32.h', diff --git a/gyp/public_headers.gypi b/gyp/public_headers.gypi index 7432d4c706..bffcf7d23b 100644 --- a/gyp/public_headers.gypi +++ b/gyp/public_headers.gypi @@ -117,6 +117,7 @@ 'utils/win/SkIStream.h', 'utils/win/SkTScopedComPtr.h', 'utils/SkBoundaryPatch.h', + 'utils/SkUnitMappers.h', 'utils/SkPictureUtils.h', 'utils/SkRandom.h', 'utils/SkMeshUtils.h', @@ -257,6 +258,7 @@ 'core/SkWriter32.h', 'core/SkError.h', 'core/SkPath.h', + 'core/SkUnitMapper.h', 'core/SkFlattenable.h', 'core/SkTSearch.h', 'core/SkRect.h', diff --git a/gyp/skia_for_chromium_defines.gypi b/gyp/skia_for_chromium_defines.gypi index 632c532513..f2ed5c335e 100644 --- a/gyp/skia_for_chromium_defines.gypi +++ b/gyp/skia_for_chromium_defines.gypi @@ -16,6 +16,7 @@ 'SK_SUPPORT_LEGACY_GETTOPDEVICE', 'SK_SUPPORT_LEGACY_N32_NAME', 'SK_SUPPORT_LEGACY_BUILDMIPMAP', + 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX', ], }, } diff --git a/gyp/utils.gyp b/gyp/utils.gyp index 9009ad9571..5b3d9ea98c 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -56,6 +56,7 @@ '../include/utils/SkRandom.h', '../include/utils/SkRTConf.h', '../include/utils/SkProxyCanvas.h', + '../include/utils/SkUnitMappers.h', '../include/utils/SkWGL.h', '../src/utils/SkBase64.cpp', @@ -109,6 +110,7 @@ '../src/utils/SkThreadUtils_win.h', '../src/utils/SkTFitsIn.h', '../src/utils/SkTLogic.h', + '../src/utils/SkUnitMappers.cpp', #mac '../include/utils/mac/SkCGUtils.h', |