summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-05 11:04:46 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-05 11:04:46 +0000
commitb5eb6d85a1adfbcb49aed9a77e18dc5c8378f2de (patch)
tree9e059db5d111bf8fa52bb4c8f5bca9ff378fbe2a
parent73ee01526043e1f54a7194b4a3c1177275981a55 (diff)
downloadchromium_src-b5eb6d85a1adfbcb49aed9a77e18dc5c8378f2de.zip
chromium_src-b5eb6d85a1adfbcb49aed9a77e18dc5c8378f2de.tar.gz
chromium_src-b5eb6d85a1adfbcb49aed9a77e18dc5c8378f2de.tar.bz2
WebKit Update 44434:44438
Add one new layout test to test_expectations.txt LayoutTests/editing/execCommand/convert-style-elements-to-spans.html = FAIL TBR=darin BUG=none TEST=none Review URL: http://codereview.chromium.org/118303 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17726 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
-rw-r--r--webkit/webkit.gyp2
3 files changed, 7 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 045ed41..649007f 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "44434",
+ "webkit_revision": "44438",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 5273ac8f..0fc64a8 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2707,3 +2707,7 @@ BUG13267 LINUX : LayoutTests/editing/selection/5131716-3.html = PASS FAIL
// WebKit 44372:44405
// New Linux crashes and failures. Why are we running platform/mac test on Linux?
BUG13314 LINUX : LayoutTests/platform/mac/accessibility/accesskey.html = CRASH FAIL
+
+// WebKit 44434:44438
+// introduced new layout_tests by webkit 44435
+BUG13417 : LayoutTests/editing/execCommand/convert-style-elements-to-spans.html = FAIL
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 88c8373..c8d70fe 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1580,6 +1580,8 @@
'../third_party/WebKit/WebCore/editing/RemoveNodeCommand.h',
'../third_party/WebKit/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp',
'../third_party/WebKit/WebCore/editing/RemoveNodePreservingChildrenCommand.h',
+ '../third_party/WebKit/WebCore/editing/ReplaceNodeWithSpanCommand.cpp',
+ '../third_party/WebKit/WebCore/editing/ReplaceNodeWithSpanCommand.h',
'../third_party/WebKit/WebCore/editing/ReplaceSelectionCommand.cpp',
'../third_party/WebKit/WebCore/editing/ReplaceSelectionCommand.h',
'../third_party/WebKit/WebCore/editing/SelectionController.cpp',