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/renderer | |
| 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/renderer')
| -rw-r--r-- | chrome/renderer/render_view.h | 2 | ||||
| -rw-r--r-- | chrome/renderer/render_widget.cc | 6 | ||||
| -rw-r--r-- | chrome/renderer/render_widget.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index a993327..678dbb5 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -23,7 +23,7 @@ #include "chrome/renderer/extensions/extension_process_bindings.h" #include "chrome/renderer/external_host_bindings.h" #include "chrome/renderer/render_widget.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "testing/gtest/include/gtest/gtest_prod.h" #include "webkit/api/public/WebConsoleMessage.h" #include "webkit/glue/dom_serializer_delegate.h" diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc index db181bd..25afdbb 100644 --- a/chrome/renderer/render_widget.cc +++ b/chrome/renderer/render_widget.cc @@ -14,14 +14,14 @@ #include "chrome/common/transport_dib.h" #include "chrome/renderer/render_process.h" #include "skia/ext/platform_canvas.h" -#include "skia/include/SkShader.h" +#include "third_party/skia/include/core/SkShader.h" #include "webkit/api/public/WebRect.h" #include "webkit/api/public/WebScreenInfo.h" #include "webkit/api/public/WebSize.h" #if defined(OS_POSIX) -#include "skia/include/SkPixelRef.h" -#include "skia/include/SkMallocPixelRef.h" +#include "third_party/skia/include/core/SkPixelRef.h" +#include "third_party/skia/include/core/SkMallocPixelRef.h" #endif // defined(OS_POSIX) #include "webkit/glue/webtextdirection.h" diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h index d2cdf96..a337f54 100644 --- a/chrome/renderer/render_widget.h +++ b/chrome/renderer/render_widget.h @@ -16,7 +16,7 @@ #include "chrome/common/ipc_channel.h" #include "chrome/renderer/render_process.h" #include "skia/ext/platform_canvas.h" -#include "skia/include/SkBitmap.h" +#include "third_party/skia/include/core/SkBitmap.h" #include "webkit/api/public/WebRect.h" #include "webkit/glue/webwidget_delegate.h" |