Roll DEPS to skia r198. This picks up a number of bugfixes for layout tests,

and font stuff for Linux.  Rebaselines affected tests, adjusts
test_expectations, and removes an extraneous include dir.  (Also sets the
svn:mime-type prop on some of the linux PNG files; they still diff as text
in rietveld this time, but I think they should be happier for next time.)

BUG=http://crbug.com/12002
TEST=If it builds, and layout tests pass, you're happy.

Review URL: http://codereview.chromium.org/118128

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17434 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 8 insertions, 11 deletions

diff --git a/DEPS b/DEPS
index 63318f0..caa5d86 100644
--- a/DEPS
+++ b/DEPS
@@ -32,7 +32,7 @@ deps = {
     "http://v8.googlecode.com/svn/trunk@2084",
 
   "src/third_party/skia":
-    "http://skia.googlecode.com/svn/trunk@171",
+    "http://skia.googlecode.com/svn/trunk@198",
 
   "src/webkit/data/layout_tests/LayoutTests":
     Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 07d98e4..9c3ad85 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -279,6 +279,7 @@
         '../third_party/skia/src/core/SkScan_Hairline.cpp',
         '../third_party/skia/src/core/SkScan_Path.cpp',
         '../third_party/skia/src/core/SkShader.cpp',
+        '../third_party/skia/src/core/SkShape.cpp',
         '../third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp',
         '../third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp',
         '../third_party/skia/src/core/SkSinTable.h',
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/inline-crash-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/inline-crash-expected.checksum
index 5b05062..2e81b7a 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/inline-crash-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/inline-crash-expected.checksum
@@ -1 +1 @@
-1dffece3ee291e41e99b99137aa4a0bb
\ No newline at end of file
+c5f3d273b961763c7fa81f3fed7b53e1
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/inline-crash-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/inline-crash-expected.png
index 5a1f9a5..6fbefed 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/inline-crash-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/inline-crash-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-expected.checksum
index a5190e3..c9f8746 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-expected.checksum
@@ -1 +1 @@
-82b6d99ebcb1f33af86e30a0d6a6bcc3
\ No newline at end of file
+2f06b33bea53f2273c5f8be50e4103fd
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-expected.png
index a120f4c..2096caf 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-opacity-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-opacity-expected.checksum
index 01f4778..c14cedd 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-opacity-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-opacity-expected.checksum
@@ -1 +1 @@
-35e23e1ba7b178d48d355efcafd52655
\ No newline at end of file
+05f2becc0b6b4795a834b01f0c1fd676
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-opacity-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-opacity-expected.png
index 9068f1a..4076622 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-opacity-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/reflections/reflection-masks-opacity-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/grayscale-gradient-mask-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/grayscale-gradient-mask-expected.checksum
index 06d17da..820f859 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/grayscale-gradient-mask-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/grayscale-gradient-mask-expected.checksum
@@ -1 +1 @@
-957f29ab70df9cfd40507c3462b9b89c
\ No newline at end of file
+c1309762cebe90969db6165b8184e160
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-expected.checksum
index 5685bac..76a5ab2 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-expected.checksum
@@ -1 +1 @@
-1c2bf6743c8d78b29f2e17a19a519ea8
\ No newline at end of file
+8f42848676af641a8148b64d1f013bae
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-expected.png
index 87a7177..eda78c0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-opacity-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-opacity-expected.checksum
index 09311ec..7983ba3 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-opacity-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-opacity-expected.checksum
@@ -1 +1 @@
-b11c70dee1c211e839be4f8a69cc881d
\ No newline at end of file
+15f61015d4fbcdfec99297483b629a2e
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-opacity-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-opacity-expected.png
index 32de047..8713a9c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-opacity-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/reflections/reflection-masks-opacity-expected.png
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a231cc2..95a28bc 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1767,7 +1767,6 @@ BUG10434 LINUX : LayoutTests/css1/text_properties/vertical_align.html = FAIL
 BUG10434 LINUX : LayoutTests/fast/repaint/transform-absolute-in-positioned-container.html = FAIL
 // SVG Mask-related tests. Most likely result of http://trac.webkit.org/changeset/41266.
 BUG10434 LINUX : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = FAIL
-BUG10434 LINUX : LayoutTests/svg/custom/grayscale-gradient-mask.svg = FAIL
 
 // Regression from merge 41268:41286
 BUG10435 LINUX : LayoutTests/fast/canvas/canvas-text-alignment.html = FAIL
@@ -2570,9 +2569,6 @@ BUG11613 WIN : LayoutTests/http/tests/navigation/javascriptlink-frames.html = FA
 
 // These tests were broken by skia r171:
 // These ones seem to be mask/opacity-related:
-BUG12002 WIN LINUX : LayoutTests/fast/reflections/reflection-masks-opacity.html = FAIL
-BUG12002 WIN LINUX : LayoutTests/fast/reflections/reflection-masks.html = FAIL
-BUG12002 WIN DEBUG : LayoutTests/svg/custom/grayscale-gradient-mask.svg = FAIL
 BUG12002 LINUX : LayoutTests/svg/custom/circular-marker-reference-3.svg = FAIL
 // This one is flaky on Linux
 BUG12004 LINUX : LayoutTests/svg/custom/js-late-marker-creation.svg = FAIL PASS