summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-01 00:16:46 +0000
committersenorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-01 00:16:46 +0000
commit2d77c1477d568ef6cb05f752b7a3139257823bd4 (patch)
tree9595f8578743ed2af13e239d5845ab14a0dd9191
parented57ee0c6141c0cb43ea3cc13e84aa9bc3af1ebe (diff)
downloadchromium_src-2d77c1477d568ef6cb05f752b7a3139257823bd4.zip
chromium_src-2d77c1477d568ef6cb05f752b7a3139257823bd4.tar.gz
chromium_src-2d77c1477d568ef6cb05f752b7a3139257823bd4.tar.bz2
Roll DEPS for Skia 435:447. Some tests need rebaselines due to change in line clipping algorithm.
BUG=none TEST=none Review URL: http://codereview.chromium.org/450017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33386 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS4
-rw-r--r--skia/skia.gyp1
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt10
3 files changed, 12 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 681d251..077b30c 100644
--- a/DEPS
+++ b/DEPS
@@ -44,10 +44,10 @@ deps = {
"http://nativeclient.googlecode.com/svn/trunk/src/native_client@1039",
"src/third_party/skia/src":
- "http://skia.googlecode.com/svn/trunk/src@435",
+ "http://skia.googlecode.com/svn/trunk/src@447",
"src/third_party/skia/include":
- "http://skia.googlecode.com/svn/trunk/include@435",
+ "http://skia.googlecode.com/svn/trunk/include@447",
"src/third_party/WebKit/LayoutTests":
Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 17237e3..7927aba 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -235,6 +235,7 @@
'../third_party/skia/src/core/SkGlyphCache.cpp',
'../third_party/skia/src/core/SkGlyphCache.h',
'../third_party/skia/src/core/SkGraphics.cpp',
+ '../third_party/skia/src/core/SkLineClipper.cpp',
'../third_party/skia/src/core/SkMMapStream.cpp',
'../third_party/skia/src/core/SkMask.cpp',
'../third_party/skia/src/core/SkMaskFilter.cpp',
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 605a31b..9251f07 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -90,7 +90,9 @@ BUG24182 WIN RELEASE SLOW : LayoutTests/http/tests/xmlhttprequest/XMLHttpRequest
BUG24182 WIN RELEASE SLOW : LayoutTests/http/tests/xmlhttprequest/connection-error-sync.html = PASS
BUG24182 WIN RELEASE SLOW : LayoutTests/http/tests/loading/onload-vs-immediate-refresh.pl = PASS
BUG24182 SLOW DEBUG : LayoutTests/editing/selection/extend-selection.html = PASS
-BUG24182 SLOW WIN : LayoutTests/fast/backgrounds/svg-as-background-5.html = PASS
+// SENORBLANCO: This should be re-enabled after it has been rebaselined for
+// Skia r447.
+// BUG24182 SLOW WIN : LayoutTests/fast/backgrounds/svg-as-background-5.html = PASS
BUG24182 SLOW DEBUG : LayoutTests/svg/css/getComputedStyle-basic.xhtml = PASS
// --- collecting results for supported-xml-content-types.html ---
@@ -3012,3 +3014,9 @@ BUG28918 DEBUG : LayoutTests/storage/domstorage/localstorage/iframe-events.html
// Flaky test added by r51350.
BUG28918 : LayoutTests/http/tests/cache/subresource-failover-to-network.html = PASS TEXT
+
+// Slight breakage from Skia r447. Needs rebaseline.
+
+BUG_SENORBLANCO WIN LINUX : LayoutTests/fast/backgrounds/svg-as-background-5.html = IMAGE
+BUG_SENORBLANCO WIN : LayoutTests/fast/overflow/scrollRevealButton.html = IMAGE
+BUG_SENORBLANCO WIN : LayoutTests/svg/transforms/text-with-pattern-with-svg-transform.svg = IMAGE