Revert "Skia merge 317:321"

The layout test failures happened on other platforms too.


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

9 files changed, 3 insertions, 29 deletions

diff --git a/DEPS b/DEPS
index aed81b2..3ada569 100644
--- a/DEPS
+++ b/DEPS
@@ -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@321",
+    "http://skia.googlecode.com/svn/trunk@317",
 
   "src/third_party/WebKit/LayoutTests":
     Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.checksum
deleted file mode 100644
index 1a003a5..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-afcabff0579e23755d0daff42e60e3d5
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.png
deleted file mode 100644
index f570fea..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.png
+++ /dev/null
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.txt
deleted file mode 100644
index fbd0592..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-image-rotate-transform-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-image-rotate-transform-expected.checksum
index f9b5b16..77166b4 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-image-rotate-transform-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-image-rotate-transform-expected.checksum
@@ -1 +1 @@
-cb005cfa5104dfed2efcbb00659dc224
\ No newline at end of file
+6d5ab803a3a6264474ce8f4ad90028bf
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-image-rotate-transform-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-image-rotate-transform-expected.png
index 8523c73..09bb467 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-image-rotate-transform-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-image-rotate-transform-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-image-rotate-transform-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-image-rotate-transform-expected.txt
deleted file mode 100644
index 1fdf17f..0000000
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/borders/border-image-rotate-transform-expected.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-layer at (8,8) size 784x584
-  RenderBody {BODY} at (8,8) size 784x584
-    RenderBlock {DIV} at (10,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
-    RenderText {#text} at (146,131) size 4x19
-      text run at (146,131) width 4: " "
-    RenderBlock {DIV} at (160,10) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
-    RenderText {#text} at (296,131) size 4x19
-      text run at (296,131) width 4: " "
-    RenderBR {BR} at (0,0) size 0x0
-    RenderBlock {DIV} at (10,161) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
-    RenderText {#text} at (146,282) size 4x19
-      text run at (146,282) width 4: " "
-    RenderBlock {DIV} at (160,161) size 126x126 [border: (21px none #000000) (30px none #000000) (21px none #000000)]
-    RenderText {#text} at (0,0) size 0x0
-    RenderText {#text} at (0,0) size 0x0
-    RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/gradients/background-clipped-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/gradients/background-clipped-expected.checksum
index 545b73c..f20d69e 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/gradients/background-clipped-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/gradients/background-clipped-expected.checksum
@@ -1 +1 @@
-3ef8e29a45ce8e6c18b6cb32d16ca879
\ No newline at end of file
+f51cf04e767cd11dadf078db22e0c9b3
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/gradients/background-clipped-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/gradients/background-clipped-expected.png
index b536ef4..d17bcb2 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/gradients/background-clipped-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/gradients/background-clipped-expected.png