diff options
author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 08:22:08 +0000 |
---|---|---|
committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-10 08:22:08 +0000 |
commit | c8c9f2cf9e95310ef8fdcdff90c1fa6a0fb93dda (patch) | |
tree | 619e34caf535cbeb64f0b0e1eae3fd906aacd3f6 | |
parent | 0be9fabe5200957cebb97b75b76ddd159a2f51a2 (diff) | |
download | chromium_src-c8c9f2cf9e95310ef8fdcdff90c1fa6a0fb93dda.zip chromium_src-c8c9f2cf9e95310ef8fdcdff90c1fa6a0fb93dda.tar.gz chromium_src-c8c9f2cf9e95310ef8fdcdff90c1fa6a0fb93dda.tar.bz2 |
Skia merge 309:310
BUG=18333
TEST=none
TBR=agl
Review URL: http://codereview.chromium.org/164234
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22902 0039d316-1c4b-4281-b951-d872f2087c98
9 files changed, 5 insertions, 5 deletions
@@ -40,7 +40,7 @@ deps = { "http://nativeclient.googlecode.com/svn/trunk/src/native_client@385", "src/third_party/skia": - "http://skia.googlecode.com/svn/trunk@309", + "http://skia.googlecode.com/svn/trunk@310", "src/third_party/WebKit/LayoutTests": Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"), diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.checksum index 0a63320..97b167c 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.checksum @@ -1 +1 @@ -4d22b8906aca6f5cffe43838862f3c33
\ No newline at end of file +73d6b5ad962c9fe87274a0e31a0a7f15
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.png Binary files differindex cfc6596..55fceb0 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/001-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.checksum index 2b67116..812c0bd 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.checksum @@ -1 +1 @@ -076cd443d91896108761d43a4798268a
\ No newline at end of file +7bf8ccc2b8f331e92e524cf9cdac98d7
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.png Binary files differindex ed4851f..f3835b2 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/002-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.checksum index 122e706..93dc51d 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.checksum @@ -1 +1 @@ -d53f2309f55d7cd723c6b5aae128808e
\ No newline at end of file +f72449e2c7fe84f3e7c4ee3589abf2d5
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.png Binary files differindex e02220c..270db8c 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/003-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.checksum index a538786..4ed5e62 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.checksum @@ -1 +1 @@ -0c804d63f0ae77a17f0ca52d0eb3a681
\ No newline at end of file +f01ffc40305c11d9de6ee7f6c978e220
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.png Binary files differindex 2b2bdf19..cd33d83 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/text/international/wrap-CJK-001-expected.png |