summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-23 07:13:31 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-23 07:13:31 +0000
commit07f99f066b009eec245ac04e1d07854d0e2861c0 (patch)
tree88dabc514e4c2d3a2b321741e595e888d262ae27 /DEPS
parent434bbefbc20f7bb5ce6cd6cb50d57b8e33163ffb (diff)
downloadchromium_src-07f99f066b009eec245ac04e1d07854d0e2861c0.zip
chromium_src-07f99f066b009eec245ac04e1d07854d0e2861c0.tar.gz
chromium_src-07f99f066b009eec245ac04e1d07854d0e2861c0.tar.bz2
Merge: chromium side [42671:42725]
Rebaselines: http://trac.webkit.org/changeset/42722 resulted in LayoutTests/editing/inserting/insert-3907422-fix.html LayoutTests/editing/pasteboard/paste-text-015.html LayoutTests/editing/style/font-family-with-space.html http://trac.webkit.org/changeset/42723 resulted in LayoutTests/editing/selection/select-all-iframe.html LayoutTests/svg/custom/pointer-events-path.svg http://trac.webkit.org/changeset/42716 resulted in LayoutTests/fast/dom/HTMLSelectElement/named-options.html http://trac.webkit.org/changeset/42725 Broke the close event behavior and resulted in disabling these ui tests: * BrowserCloseBeforeUnloadOK and * BrowserCloseBeforeUnloadCancel Review URL: http://codereview.chromium.org/92051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 1612c0b..d2550be 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "42671",
+ "webkit_revision": "42725",
}
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@214",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@14193",
+ "/trunk/deps/third_party/WebKit@14289",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@13472",