summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-21 22:14:12 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-21 22:14:12 +0000
commitc092b6c600d77f4ece53b3bb31642963ee8be47a (patch)
treea3fe7f99190d588a1be15fe4b053d842d4cb33b2
parentdb300c942516692688ebd84fefe00d64de01a109 (diff)
downloadchromium_src-c092b6c600d77f4ece53b3bb31642963ee8be47a.zip
chromium_src-c092b6c600d77f4ece53b3bb31642963ee8be47a.tar.gz
chromium_src-c092b6c600d77f4ece53b3bb31642963ee8be47a.tar.bz2
It's not that you clobbered the change, I just forgot to up the DEPS.
I'm also removing the failing test that made me implement this. BUG=none TEST=none TBR=dglazkov Review URL: http://codereview.chromium.org/18633 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8393 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt3
2 files changed, 3 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index de62c89..929dc48 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@8367",
+ "/trunk/deps/third_party/WebKit@8373",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@7525",
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index d54b6f1..a1cc06a 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1757,8 +1757,9 @@ LINUX : LayoutTests/fast/transforms/transformed-document-element.html = FAIL
WIN DEBUG : LayoutTests/editing/execCommand/paste-2.html = PASS FAIL
// Merge 39520:39606 -- new test.
-WIN : LayoutTests/fast/canvas/set-colors.html = FAIL
// Crashes on the buildbot reliably(?) but not locally, even under Valgrind.
+// NOTE: after crashes are worked out, this likely just needs to be
+// rebaselined as was done on Windows (after adding RGB->CMYK converter).
LINUX : LayoutTests/fast/canvas/set-colors.html = FAIL CRASH
// Merge 39606:39660 - new tests