diff options
author | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 13:16:52 +0000 |
---|---|---|
committer | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 13:16:52 +0000 |
commit | d5282e72b2da0b27b2a487d8376c44ad795736dc (patch) | |
tree | 7296767f5fcfa3b1cdd46f122e14dfaca1dd7e4a /skia/config/win | |
parent | 3ac3f51f8261910dbc38ccfa4cdf3d491ba7ecdb (diff) | |
download | chromium_src-d5282e72b2da0b27b2a487d8376c44ad795736dc.zip chromium_src-d5282e72b2da0b27b2a487d8376c44ad795736dc.tar.gz chromium_src-d5282e72b2da0b27b2a487d8376c44ad795736dc.tar.bz2 |
This CL updates chrome to the latest version of skia, retrieved via DEPS, and
placed in third_party. All relevant skia changes (for all 3 platforms) have
been upstreamed.
Most of this CL is mind-numbingly repetitive. Things of interest are: skia.gyp
(now points at third_party versions), DEPS, and SkUserConfig.h. stdint.h: Skia
now requires C99 integer types, which MSVC doesn't support natively. I have put
typedefs in config/win/stdint.h.
Note that the new version of skia appears to render rects whose coordinates
are "backwards" (ie., x2 < x1 or y2 < y1), which were formerly culled. There
were a couple obvious instances of this in the code which I fixed, but there may
be more.
There were ~35 layout test failures due to minor pixel differences which I
rebaselined on Windows and Linux, and 8 genuine failures related to masks and
stroked text, which I have put in text_expectations.txt and assigned to
myself. (There was another change which broke ~1700 tests on each platform,
but I put that change behind an #ifdef for now).
R=brettw
Review URL: http://codereview.chromium.org/65012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/config/win')
-rw-r--r-- | skia/config/win/stdint.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/skia/config/win/stdint.h b/skia/config/win/stdint.h new file mode 100644 index 0000000..b82f16b --- /dev/null +++ b/skia/config/win/stdint.h @@ -0,0 +1,26 @@ +// Copyright (c) 2009 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. + +// skia is written in C99 and requires <stdint.h> and <inttypes.h>. +// Since MSVC doesn't include these headers, we have to write our own version +// to provide a compatibility layer between MSVC and skia + +#ifndef SKIA_CONFIG_WIN_STDINT_H_ +#define SKIA_CONFIG_WIN_STDINT_H + +#if !defined(_MSC_VER) +#error This file should only be included when compiling with MSVC. +#endif + +// Define C99 equivalent types. +typedef signed char int8_t; +typedef signed short int16_t; +typedef signed int int32_t; +typedef signed long long int64_t; +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long long uint64_t; + +#endif // SKIA_CONFIG_WIN_STDINT_H |