Switch to standard integer types in skia/.

skia/ext/convolver.h

 // 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.
 
 #ifndef SKIA_EXT_CONVOLVER_H_
 #define SKIA_EXT_CONVOLVER_H_
 
+#include <stdint.h>

[Nico, 2015/12/22 17:13:28]

i think this one isn't needed either, but int16_t is mentioned in a comment, so
ok

+
 #include <cmath>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "build/build_config.h"
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkTypes.h"
 
 // We can build SSE2 optimized versions for all x86 CPUs
 // except when building for the IOS emulator.
 #if defined(ARCH_CPU_X86_FAMILY) && !defined(OS_IOS)
 #define SIMD_SSE2 1
-#define SIMD_PADDING 8  // 8 * int16
+#define SIMD_PADDING 8  // 8 * int16_t
 #endif
 
 #if defined (ARCH_CPU_MIPS_FAMILY) && \
     defined(__mips_dsp) && (__mips_dsp_rev >= 2)
 #define SIMD_MIPS_DSPR2 1
 #endif
 // avoid confusion with Mac OS X's math library (Carbon)
 #if defined(__APPLE__)
 #undef FloatToFixed
 #undef FixedToFloat
@@ skipping 196 matching lines @@
 // Set up the |filter| instance with a gaussian kernel. |kernel_sigma| is the
 // parameter of gaussian. If |derivative| is true, the kernel will be that of
 // the first derivative. Intended for use with the two routines above.
 SK_API void SetUpGaussianConvolutionKernel(ConvolutionFilter1D* filter,
                                            float kernel_sigma,
                                            bool derivative);
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_CONVOLVER_H_