summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
2 files changed, 5 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index aff6578..97e1e76 100644
--- a/DEPS
+++ b/DEPS
@@ -43,7 +43,7 @@ vars = {
"lss_revision": "9",
"ffmpeg_revision": "122092",
"sfntly_revision": "118",
- "skia_revision": "3271",
+ "skia_revision": "3278",
# 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 a09f242..d5c64ce 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -37,3 +37,7 @@ BUGCR110926 : svg/custom/animate-target-id-changed.svg = PASS IMAGE TEXT IMAGE+T
BUGCR110926 : svg/filters/big-sized-filter.svg = PASS IMAGE TEXT IMAGE+TEXT
BUGCR110926 : svg/transforms/animated-path-inside-transformed-html.xhtml = PASS IMAGE TEXT IMAGE+TEXT
BUGCR110926 : svg/wicd/test-scalable-background-image1.xhtml = PASS IMAGE TEXT IMAGE+TEXT
+
+// EPOGER: To be rebaselined after skia rev. 3283 lands in webkit
+BUGCR116252 LINUX : platform/chromium-linux/fast/text/chromium-linux-fontconfig-renderstyle.html = IMAGE
+