diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-28 16:15:09 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-28 16:15:09 +0000 |
| commit | 69636af85ca92d22c6150a1117d4a93a16c5b3bd (patch) | |
| tree | fe70979bf051108763f67174e40e4d1c2539fb30 /DEPS | |
| parent | 0b7149a6a34edbaf7bc318b30ab684c7ef7dfc13 (diff) | |
| download | chromium_src-69636af85ca92d22c6150a1117d4a93a16c5b3bd.zip chromium_src-69636af85ca92d22c6150a1117d4a93a16c5b3bd.tar.gz chromium_src-69636af85ca92d22c6150a1117d4a93a16c5b3bd.tar.bz2 | |
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
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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", |