summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 04:26:24 +0000
committerjorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-20 04:26:24 +0000
commit55c1e6296120949a6633ba764e3a9ec12e663a8b (patch)
tree8b79933837bd196908f784b835fee5347559e0c6
parent8cd89cca063a2087ff9cf2ed89989c5a0024da09 (diff)
downloadchromium_src-55c1e6296120949a6633ba764e3a9ec12e663a8b.zip
chromium_src-55c1e6296120949a6633ba764e3a9ec12e663a8b.tar.gz
chromium_src-55c1e6296120949a6633ba764e3a9ec12e663a8b.tar.bz2
Roll WebKit deps: r47528:47546
TEST=none BUG=19796 Review URL: http://codereview.chromium.org/173113 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23804 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt8
2 files changed, 9 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 05b4451..69ed15f 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "47528",
+ "webkit_revision": "47546",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index e5af018..560b03a 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2918,3 +2918,11 @@ BUG19782 WIN DEBUG : LayoutTests/fast/dom/text-control-crash-on-select.html = CR
// Fails due to textInputController.setInputMethod not implemented for Mac.
BUG19665 MAC : LayoutTests/platform/mac/editing/input/hangul-enter-confirms-and-sends-keypress.html = FAIL
BUG19665 MAC : LayoutTests/platform/mac/editing/input/kotoeri-enter-to-confirm-and-newline.html = FAIL
+
+// Fallout from r47528:47546
+BUG19796 LINUX WIN : LayoutTests/editing/style/remove-underline-across-paragraph.html = FAIL
+BUG19796 LINUX WIN : LayoutTests/editing/style/remove-underline-after-paragraph.html = FAIL
+BUG19796 LINUX WIN : LayoutTests/editing/style/remove-underline.html = FAIL
+BUG19796 LINUX WIN : LayoutTests/editing/style/underline.html = FAIL
+BUG19796 LINUX WIN : LayoutTests/plugins/netscape-plugin-setwindow-size-2.html = FAIL
+BUG19796 WIN : LayoutTests/plugins/netscape-plugin-setwindow-size.html = FAIL