summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 23:19:37 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 23:19:37 +0000
commite2756703a3c14d7c60c6a476f4452ae60fb0adaf (patch)
treeb15a09a7ed4b94dc6e23bb9595bfc7ac42bc8580 /DEPS
parentdf53c2eafb50eb3a800dc58ce2e0fbb0f4c97ccc (diff)
downloadchromium_src-e2756703a3c14d7c60c6a476f4452ae60fb0adaf.zip
chromium_src-e2756703a3c14d7c60c6a476f4452ae60fb0adaf.tar.gz
chromium_src-e2756703a3c14d7c60c6a476f4452ae60fb0adaf.tar.bz2
WebKit merge 41530:41559.
Minor issues: 1- WebCore::Position no longer has an offset() method. Instead, it seems to have been replaced by a public m_offset member variable. WebCore code now just uses that directly instead, so we need to do the same. 2- Added / removed sources from the project files. R=eroman Review URL: http://codereview.chromium.org/42046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11400 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 6b546c1..fbc418b 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "41530",
+ "webkit_revision": "41559",
}
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@11353",
+ "/trunk/deps/third_party/WebKit@11399",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@11389",