summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--skia/skia.gyp1
-rw-r--r--skia/skia_test_expectations.txt31
3 files changed, 33 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 551fcad..440f940 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ vars = {
"ffmpeg_hash": "82ae69cc47f25f9a59cf2ca8742e3391c34e7602",
"sfntly_revision": "134",
- "skia_revision": "6474",
+ "skia_revision": "6523",
# 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/skia/skia.gyp b/skia/skia.gyp
index aa02390..37bfe42 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -218,6 +218,7 @@
'GR_STATIC_RECT_VB=1',
'GR_AGGRESSIVE_SHADER_OPTS=1',
'SK_DEFERRED_CANVAS_USES_GPIPE=1',
+ 'SK_IGNORE_NEW_STROKERECT',
# this flag can be removed entirely once this has baked for a while
'SK_ALLOW_OVER_32K_BITMAPS',
diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt
index 3d8ae2b..a3d8873 100644
--- a/skia/skia_test_expectations.txt
+++ b/skia/skia_test_expectations.txt
@@ -77,4 +77,35 @@ crbug.com/161762 svg/custom/invalid-uri-stroke.svg [ Failure ImageOnlyFailure ]
crbug.com/161762 svg/wicd/test-scalable-background-image1.xhtml [ Failure ImageOnlyFailure ]
crbug.com/161762 svg/zoom/page/zoom-mask-with-percentages.svg [ Failure ImageOnlyFailure ]
+# To be rebaselined for https://code.google.com/p/skia/source/detail?r=6483
+crbug.com/161899 compositing/shadows/shadow-drawing.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/box-shadow/basic-shadows.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/box-shadow/box-shadow-clipped-slices.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/box-shadow/box-shadow-radius.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/box-shadow/box-shadow-transformed.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/box-shadow/inset-box-shadow-radius.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/box-shadow/inset-box-shadows.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/box-shadow/inset.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/box-shadow/scaled-box-shadow.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/box-shadow/single-pixel-shadow.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/repaint/box-shadow-h.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/repaint/box-shadow-v.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/repaint/shadow-multiple-vertical.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/repaint/transform-replaced-shadows.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 fast/transforms/shadows.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-ru.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance-step.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 platform/chromium/fast/forms/calendar-picker/calendar-picker-appearance.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 platform/chromium/fast/forms/calendar-picker/month-picker-appearance-step.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 platform/chromium/fast/forms/calendar-picker/month-picker-appearance.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 platform/chromium/fast/forms/calendar-picker/week-picker-appearance-step.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 platform/chromium/fast/forms/calendar-picker/week-picker-appearance.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 platform/chromium/fast/forms/color/color-suggestion-picker-appearance.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 platform/chromium/fast/forms/color/color-suggestion-picker-one-row-appearance.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 platform/chromium/fast/forms/color/color-suggestion-picker-two-row-appearance.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 platform/chromium/fast/forms/color/color-suggestion-picker-with-scrollbar-appearance.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 platform/chromium/virtual/softwarecompositing/shadows/shadow-drawing.html [ Failure ImageOnlyFailure ]
+crbug.com/161899 svg/filters/shadow-on-rect-with-filter.svg [ Failure ImageOnlyFailure ]
+
+
# END OVERRIDES HERE (this line ensures that the file is newline-terminated)