summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjaphet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 20:46:23 +0000
committerjaphet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 20:46:23 +0000
commit6aac52dd78f593e4fbb101d4808769e6bb286389 (patch)
treec20e0c9c85b52a21f1eb46e34db27416705bf252 /webkit
parentfb23b9b370b689a954fb42b0beea2e61eee9e159 (diff)
downloadchromium_src-6aac52dd78f593e4fbb101d4808769e6bb286389.zip
chromium_src-6aac52dd78f593e4fbb101d4808769e6bb286389.tar.gz
chromium_src-6aac52dd78f593e4fbb101d4808769e6bb286389.tar.bz2
Roll Webkit DEPS 45916:45936.
BUG=none TEST=green builds Review URL: http://codereview.chromium.org/155587 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 5175d4e..d1bb43a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2984,3 +2984,7 @@ BUG16823 MAC : LayoutTests/editing/style/font-family-with-space.html = FAIL
BUG16823 MAC : LayoutTests/editing/style/non-inheritable-styles.html = FAIL
BUG16823 MAC : LayoutTests/editing/style/smoosh-styles-003.html = FAIL
BUG16823 MAC : LayoutTests/fast/lists/drag-into-marker.html = FAIL
+
+// Failures from WebKit merge 45916:45936
+BUG16850 LINUX WIN : LayoutTests/fast/css/rem-dynamic-scaling.html = FAIL
+BUG16850 LINUX WIN : LayoutTests/fast/css/rem-units-on-root.html = FAIL