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 /chrome/browser/history | |
| 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 'chrome/browser/history')
| -rw-r--r-- | chrome/browser/history/page_usage_data.h | 2 | ||||
| -rw-r--r-- | chrome/browser/history/thumbnail_database.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/history/thumbnail_database.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/history/page_usage_data.h b/chrome/browser/history/page_usage_data.h index e281078..57b0be1 100644 --- a/chrome/browser/history/page_usage_data.h +++ b/chrome/browser/history/page_usage_data.h @@ -9,7 +9,7 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_types.h" #include "googleurl/src/gurl.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" ///////////////////////////////////////////////////////////////////////////// // diff --git a/chrome/browser/history/thumbnail_database.cc b/chrome/browser/history/thumbnail_database.cc index fcd5332..cab27dc 100644 --- a/chrome/browser/history/thumbnail_database.cc +++ b/chrome/browser/history/thumbnail_database.cc @@ -12,7 +12,7 @@ #include "chrome/browser/history/url_database.h" #include "chrome/common/sqlite_utils.h" #include "chrome/common/thumbnail_score.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" using base::Time; diff --git a/chrome/browser/history/thumbnail_database.h b/chrome/browser/history/thumbnail_database.h index e774a86..50ee8aa 100644 --- a/chrome/browser/history/thumbnail_database.h +++ b/chrome/browser/history/thumbnail_database.h @@ -12,7 +12,7 @@ #include "chrome/browser/history/url_database.h" // For DBCloseScoper. #include "chrome/browser/meta_table_helper.h" #include "chrome/common/sqlite_compiled_statement.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" struct sqlite3; struct ThumbnailScore; |