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 /base/gfx | |
| 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 'base/gfx')
| -rw-r--r-- | base/gfx/jpeg_codec.cc | 2 | ||||
| -rw-r--r-- | base/gfx/native_theme.cc | 2 | ||||
| -rw-r--r-- | base/gfx/native_theme.h | 2 | ||||
| -rw-r--r-- | base/gfx/png_decoder.cc | 2 | ||||
| -rw-r--r-- | base/gfx/png_encoder.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/base/gfx/jpeg_codec.cc b/base/gfx/jpeg_codec.cc index d78ca8e..f611bf0 100644 --- a/base/gfx/jpeg_codec.cc +++ b/base/gfx/jpeg_codec.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/scoped_ptr.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" extern "C" { #include "third_party/libjpeg/jpeglib.h" diff --git a/base/gfx/native_theme.cc b/base/gfx/native_theme.cc index 39ca39d..c2d7682 100644 --- a/base/gfx/native_theme.cc +++ b/base/gfx/native_theme.cc @@ -15,7 +15,7 @@ #include "base/scoped_handle.h" #include "skia/ext/platform_canvas.h" #include "skia/ext/skia_utils_win.h" -#include "skia/include/SkShader.h" +#include "third_party/skia/include/core/SkShader.h" namespace { diff --git a/base/gfx/native_theme.h b/base/gfx/native_theme.h index 519bf94..7769c4e 100644 --- a/base/gfx/native_theme.h +++ b/base/gfx/native_theme.h @@ -15,7 +15,7 @@ #include <uxtheme.h> #include "base/basictypes.h" #include "base/gfx/size.h" -#include "skia/include/SkColor.h" +#include "third_party/skia/include/core/SkColor.h" namespace skia { class PlatformCanvasWin; diff --git a/base/gfx/png_decoder.cc b/base/gfx/png_decoder.cc index e730a62..1a45057 100644 --- a/base/gfx/png_decoder.cc +++ b/base/gfx/png_decoder.cc @@ -5,7 +5,7 @@ #include "base/gfx/png_decoder.h" #include "base/logging.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" extern "C" { #include "third_party/libpng/png.h" diff --git a/base/gfx/png_encoder.cc b/base/gfx/png_encoder.cc index 0513429..5021721 100644 --- a/base/gfx/png_encoder.cc +++ b/base/gfx/png_encoder.cc @@ -5,7 +5,7 @@ #include "base/basictypes.h" #include "base/gfx/png_encoder.h" #include "base/logging.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" extern "C" { #include "third_party/libpng/png.h" |