From a5e685e22c1436f81fa29547eed1134541f7f682 Mon Sep 17 00:00:00 2001
From: "brettw@chromium.org"
<brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 15 Sep 2009 21:23:33 +0000
Subject: [PATCH] WebKit merge 48388:48399
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/206018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26267 0039d316-1c4b-4281-b951-d872f2087c98
---
DEPS | 2 +-
webkit/tools/layout_tests/test_expectations.txt | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/DEPS b/DEPS
index 788c53c04389c..7dd1d23d2003e 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "48388",
+ "webkit_revision": "48399",
}
deps = {
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 8eba57ce1f14c..5efd685e63e46 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2329,3 +2329,7 @@ BUG21859 WIN-VISTA : LayoutTests/fast/text/basic/006.html = FAIL
BUG21859 WIN-XP : LayoutTests/fast/text/line-breaks.html = FAIL
BUG21859 WIN : LayoutTests/fast/overflow/overflow-float-stacking.html = FAIL
BUG21859 WIN : LayoutTests/tables/mozilla/bugs/bug96343.html = FAIL
+
+// WK roll 48388:48399 (brettw)
+BUG21919 WIN : LayoutTests/http/tests/security/mixedContent/insecure-css-in-main-frame.html = FAIL
+BUG21919 WIN : LayoutTests/transforms/2d/hindi-rotated.html = FAIL
--
GitLab