summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-23 16:44:57 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-23 16:44:57 +0000
commitffc5bb5f0a60ffc1044ee49b4d206733c47086a7 (patch)
tree1a67e10609a46516dee95766b73feabb0cd6f86d
parenta2006ecefa10d259d0a85ac4146b913eb0f9d02f (diff)
downloadchromium_src-ffc5bb5f0a60ffc1044ee49b4d206733c47086a7.zip
chromium_src-ffc5bb5f0a60ffc1044ee49b4d206733c47086a7.tar.gz
chromium_src-ffc5bb5f0a60ffc1044ee49b4d206733c47086a7.tar.bz2
Revert "Skia roll r524:r537"
It's causing internal compiler errors on ARM. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45450 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt14
2 files changed, 1 insertions, 15 deletions
diff --git a/DEPS b/DEPS
index 55144bf..374f8a8 100644
--- a/DEPS
+++ b/DEPS
@@ -3,7 +3,7 @@ vars = {
"http://svn.webkit.org/repository/webkit/trunk",
"webkit_revision": "58033",
"ffmpeg_revision": "45289",
- "skia_revision": "537",
+ "skia_revision": "524",
"chromium_git": "http://src.chromium.org/git",
"swig_revision": "40423",
"nacl_revision": "2072",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 73303b6..e4a7d33 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -24,17 +24,3 @@ BUGEVAN : svg/clip-path/clip-path-child-clipped.svg = PASS FAIL
// Enabling EventSource in chromium before landing updated expectations.
// Remove this after rolling http://trac.webkit.org/changeset/58099.
BUG42319 : fast/dom/prototype-inheritance.html = FAIL
-
-// Rolling Skia forward. Putting these here so that I can get results from the
-// bots. --agl
-BUGAGL : css2.1/t0803-c5505-mrgn-00-b-ag.html = IMAGE
-BUGAGL : tables/mozilla/bugs/bug10565.html = IMAGE
-BUGAGL : tables/mozilla/bugs/bug4427.html = IMAGE
-BUGAGL : fast/dom/Window/btoa-pnglet.html = IMAGE
-BUGAGL : css2.1/t0804-c5509-padn-l-03-f-g.html = IMAGE
-BUGAGL : tables/mozilla/bugs/bug16012.html = IMAGE
-BUGAGL : tables/mozilla/bugs/bug4803.html = IMAGE
-BUGAGL : tables/mozilla/bugs/bug14323.html = IMAGE
-BUGAGL : fast/replaced/image-solid-color-with-alpha.html = IMAGE
-BUGAGL : tables/mozilla/bugs/bug10633.html = IMAGE
-BUGAGL : fast/canvas/canvas-empty-image-pattern.html = IMAGE