summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-03 01:42:59 +0000
committerdimich@chromium.org <dimich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-03 01:42:59 +0000
commit1d1d02b6cfec481b362b97d1cf774b649b443237 (patch)
treef7c9a9d378ea0ae3acf836e66abe4da17955110a
parentd275d7aeb039564c79f05649523e38720b293a0e (diff)
downloadchromium_src-1d1d02b6cfec481b362b97d1cf774b649b443237.zip
chromium_src-1d1d02b6cfec481b362b97d1cf774b649b443237.tar.gz
chromium_src-1d1d02b6cfec481b362b97d1cf774b649b443237.tar.bz2
WebKit roll 71175:71197
TBR=rolandsteiner BUG=none TEST=none Review URL: http://codereview.chromium.org/4324002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64863 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
2 files changed, 4 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index ba93220..85db952 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "71175",
+ "webkit_revision": "71197",
"skia_revision": "621",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "40423",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 13251af..dd31bc1 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -25,5 +25,6 @@ BUGPKASTING WIN : fast/images/gif-loop-count.html = IMAGE
BUG61411 WIN : inspector/styles-source-lines-inline.html = TEXT
// Was already marked as flaky on Win, seems to fail on Mac too.
-//BUG31342 WIN RELEASE : security/block-test-no-port.html = TEXT PASS
-BUGDIMICH WIN LINUX : security/block-test-no-port.html = TEXT
+BUG31342 MAC WIN RELEASE : security/block-test-no-port.html = TEXT PASS
+
+BUGDIMICH MAC : fast/repaint/selection-rl.html = IMAGE