From 69636af85ca92d22c6150a1117d4a93a16c5b3bd Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Tue, 28 Oct 2008 16:15:09 +0000 Subject: Only provide one version of RenderTextControlInnerBlock In upstream Webkit r36057, RenderTextControlInnerBlock moved from rendering/RenderTextControl.cpp to rendering/TextControlInnerElements.cpp. Our WebKit snapshot purports to be r36102, but our version of RenderTextControl.cpp does not have this change, or others made in r36057. It looks like our version of that file, unforked at r3114 but previously in pending with the same problem, never had the upstream changes merged into it properly during the r36102 WebKit merge. DEPS change corresponds to third_party/WebKit r4065 Review URL: http://codereview.chromium.org/8661 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4066 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DEPS') diff --git a/DEPS b/DEPS index 99000e5..2699868 100644 --- a/DEPS +++ b/DEPS @@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@3974", + "/trunk/deps/third_party/WebKit@4065", "src/third_party/cygwin": "/trunk/deps/third_party/cygwin@3248", -- cgit v1.1