commit 6961b3face1e19a7c4d9641ef1c7b4ec1c6120e2
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 25 19:44:07 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 25 19:44:07 2013 +0000
tree b7c2a42c8cbcda44a35effddb088f8e75d64cd35
parent 504bbc128b01b9cdcc3a77310bfb5fd1c5078f74

remove SkFloatToScalar macro

BUG=
R=reed@google.com, djsollen@google.com

Author: caryclark@google.com

Review URL: https://codereview.chromium.org/85463005

git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12385 2bbb7eff-a529-9590-31e7-b0007b416f81

common.gypi

diff --git a/common.gypi b/common.gypi
index aaf741d..d55b7cc 100644
--- a/common.gypi
+++ b/common.gypi
@@ -14,6 +14,7 @@
     'defines': [
       'SK_GAMMA_SRGB',
       'SK_GAMMA_APPLY_TO_A8',
+      'SK_SCALAR_TO_FLOAT_EXCLUDED',  # temporary to allow Chrome to call SkFloatToScalar
     ],
 
     # Validate the 'skia_os' setting against 'OS', because only certain