diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 23:50:10 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 23:50:10 +0000 |
| commit | 4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42 (patch) | |
| tree | e07a8daf01551fbe199adeae938fe55ba23e75f3 /DEPS | |
| parent | ce7466172c196bf06ccd473677b218eead15b089 (diff) | |
| download | chromium_src-4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42.zip chromium_src-4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42.tar.gz chromium_src-4d3eb1da483f0c50282e4f78fd0344a0dc3ffd42.tar.bz2 | |
Chrome side of webkit merge from r41860 to 41906.
The encoding parameter got dropped from Workers (r41871) so
drop it through the whole stack.
The upstream WorkerContextExecutionProxy has trackEvent with a lower
case t, but we pull in the wrong header in some places so make
both headers match.
Review URL: http://codereview.chromium.org/42538
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "41860", + "webkit_revision": "41906", } @@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@12202", + "/trunk/deps/third_party/WebKit@12324", "src/third_party/icu38": "/trunk/deps/third_party/icu38@11496", |