summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 14:56:26 +0000
committerrobertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 14:56:26 +0000
commitd38eb2edf33ef3e190ee7e12074d96cb626b8997 (patch)
tree8b1f0cc689852932cfd2aa1670850a805d57d307 /skia
parent48a34aaf40b7e7889aa5fc7c4450a32e767c85f6 (diff)
downloadchromium_src-d38eb2edf33ef3e190ee7e12074d96cb626b8997.zip
chromium_src-d38eb2edf33ef3e190ee7e12074d96cb626b8997.tar.gz
chromium_src-d38eb2edf33ef3e190ee7e12074d96cb626b8997.tar.bz2
Roll Skia DEPS to r6523
Basing this roll on: https://codereview.chromium.org/11419109/ with a minor patch Review URL: https://codereview.chromium.org/11411125 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/skia.gyp1
-rw-r--r--skia/skia_test_expectations.txt31
2 files changed, 32 insertions, 0 deletions
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)