summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-29 00:06:10 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-29 00:06:10 +0000
commit4cb07547b8ac9357f6070513ad8ac18d8c38b42e (patch)
tree5b427a038355427ce5564592143c42e43aa4357c
parentfd4b62df1b8eb5d3a6e2143ed86db144a1c29af2 (diff)
downloadchromium_src-4cb07547b8ac9357f6070513ad8ac18d8c38b42e.zip
chromium_src-4cb07547b8ac9357f6070513ad8ac18d8c38b42e.tar.gz
chromium_src-4cb07547b8ac9357f6070513ad8ac18d8c38b42e.tar.bz2
WebKit roll 50235:50245
TBR=rolandsteiner TEST=none BUG=none Review URL: http://codereview.chromium.org/340026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30405 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
2 files changed, 6 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 4903ec6..9a97f7d 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "50235",
+ "webkit_revision": "50248",
"ffmpeg_revision": "28488",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index bd9dd0c..dc471d9 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3243,8 +3243,12 @@ BUG_JAPHET LINUX DEBUG : LayoutTests/fast/multicol/column-rules.html = PASS FAIL
// Not sure when this started being flaky
BUG_JAPHET LINUX : LayoutTests/svg/custom/viewport-update2.svg = PASS FAIL
-// WebKit roll 50i218:50235
+// WebKit roll 50218:50235
BUG_JORLOW : LayoutTests/http/tests/ssl/referer-301.html = FAIL
BUG_JORLOW : LayoutTests/http/tests/ssl/referer-303.html = FAIL
BUG_JORLOW MAC : LayoutTests/fast/css/counters/t1204-increment-00-c-o.html = FAIL
BUG_JORLOW MAC : LayoutTests/fast/css/counters/t1204-increment-01-c-o.html = FAIL
+
+// WebKit roll 50235:50245
+BUG_JOTH LINUX WIN : LayoutTests/fast/css/text-input-with-webkit-border-radius.html = IMAGE+TEXT
+BUG_JORLOW WIN : chrome/fast/forms/basic-selects.html = IMAGE