summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 17:31:09 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-15 17:31:09 +0000
commit9dcec393b7dbc7b0fad330c6f210bae50bc5e53f (patch)
treef5bdaa99ed0c7b55a51d03b46f91651fe96d94c2
parent8b61ffdae171b65bef4cb9ab7c586ca9afead451 (diff)
downloadchromium_src-9dcec393b7dbc7b0fad330c6f210bae50bc5e53f.zip
chromium_src-9dcec393b7dbc7b0fad330c6f210bae50bc5e53f.tar.gz
chromium_src-9dcec393b7dbc7b0fad330c6f210bae50bc5e53f.tar.bz2
roll skia to 3402
Review URL: https://chromiumcodereview.appspot.com/9699077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126933 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 02b8cc8..c3159d5 100644
--- a/DEPS
+++ b/DEPS
@@ -50,7 +50,7 @@ vars = {
"ffmpeg_hash": "ddcf259fa5fb83159d441bd71f54e617e2a4afd3",
"sfntly_revision": "128",
- "skia_revision": "3394",
+ "skia_revision": "3402",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 7a8f45d..0ccf700 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -40,3 +40,6 @@ BUGYANGGUO WIN : svg/css/stars-with-shadow.html = TEXT
BUGCR117799 : fast/backgrounds/repeat/negative-offset-repeat-transformed.html = IMAGE
+// rebaseline when skia 3398 lands
+BUGEPOGER : platform/chromium/virtual/gpu/fast/canvas/quadraticCurveTo.xml = IMAGE
+