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 /views/controls/table | |
| 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 'views/controls/table')
| -rw-r--r-- | views/controls/table/table_view.cc | 4 | ||||
| -rw-r--r-- | views/controls/table/table_view.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc index bde6bec..5ab86d3 100644 --- a/views/controls/table/table_view.cc +++ b/views/controls/table/table_view.cc @@ -15,8 +15,8 @@ #include "base/string_util.h" #include "base/win_util.h" #include "skia/ext/skia_utils_win.h" -#include "skia/include/SkBitmap.h" -#include "skia/include/SkColorFilter.h" +#include "third_party/skia/include/core/SkBitmap.h" +#include "third_party/skia/include/core/SkColorFilter.h" #include "views/controls/hwnd_view.h" namespace views { diff --git a/views/controls/table/table_view.h b/views/controls/table/table_view.h index 20514c3..2db5234 100644 --- a/views/controls/table/table_view.h +++ b/views/controls/table/table_view.h @@ -18,7 +18,7 @@ #include "app/l10n_util.h" #include "base/logging.h" -#include "skia/include/SkColor.h" +#include "third_party/skia/include/core/SkColor.h" #if defined(OS_WIN) // TODO(port): remove the ifdef when native_control.h is ported. #include "views/controls/native_control.h" |