remove SkFloatToScalar macro

gyp/common.gypi

 # Copyright 2011 The Android Open Source Project
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # This file is automatically included by gyp_skia when building any target.
 
 {
   'includes': [
     'common_variables.gypi',
   ],
 
   'target_defaults': {
     '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
     # combinations work.  You should only override 'skia_os' for certain
     # situations, like building for iOS on a Mac.
     'variables': {
       'conditions': [
         [ 'skia_os != OS and not ((skia_os == "ios" and OS == "mac") or \
                                   (skia_os == "nacl" and OS == "linux") or \
                                   (skia_os == "chromeos" and OS == "linux"))', {
@@ skipping 80 matching lines @@
         ],
       },
     },
   }, # end 'target_defaults'
 }
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: