diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 20:32:42 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 20:32:42 +0000 |
| commit | 34b9de55b7843a44963efc5b0a460871a4d27a80 (patch) | |
| tree | 0a72c14bf5f227a528210239f1e385336874afca /DEPS | |
| parent | acbfe5da0789a704455f491978073c6ab409e268 (diff) | |
| download | chromium_src-34b9de55b7843a44963efc5b0a460871a4d27a80.zip chromium_src-34b9de55b7843a44963efc5b0a460871a4d27a80.tar.gz chromium_src-34b9de55b7843a44963efc5b0a460871a4d27a80.tar.bz2 | |
chrome side of the webkit merge
- Add platform specific chromiumclipboard files.
- Some methods got renamed in renderlayer, so change some method names in our glue code.
Review URL: http://codereview.chromium.org/27096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 172 |
1 files changed, 86 insertions, 86 deletions
@@ -1,86 +1,86 @@ -vars = { - "webkit_trunk": - "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "41149", -} - - -deps = { - "src/breakpad/src": - "http://google-breakpad.googlecode.com/svn/trunk/src@285", - - "src/googleurl": - "http://google-url.googlecode.com/svn/trunk@96", - - "src/sdch/open-vcdiff": - "http://open-vcdiff.googlecode.com/svn/trunk@22", - - "src/testing/gtest": - "http://googletest.googlecode.com/svn/trunk@167", - - "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@10232", - - "src/third_party/icu38": - "/trunk/deps/third_party/icu38@9252", - - "src/v8": - "http://v8.googlecode.com/svn/trunk@1266", - - "src/webkit/data/layout_tests/LayoutTests": - Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"), - - "src/third_party/WebKit/WebKit/mac": - Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"), - - "src/third_party/WebKit/WebKitLibraries": - Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"), -} - - -deps_os = { - "win": { - "src/third_party/cygwin": - "/trunk/deps/third_party/cygwin@3248", - - "src/third_party/python_24": - "/trunk/deps/third_party/python_24@7444", - - "src/third_party/svn": - "/trunk/deps/third_party/svn@3230", - }, - "mac": { - "src/third_party/GTM": - "http://google-toolbox-for-mac.googlecode.com/svn/trunk/@77", - "src/third_party/pdfsqueeze": - "http://pdfsqueeze.googlecode.com/svn/trunk/@2", - }, -} - - -include_rules = [ - # Everybody can use some things. - "+base", - "+build", - - # For now, we allow ICU to be included by specifying "unicode/...", although - # this should probably change. - "+unicode", - "+testing", - - # Allow anybody to include files from the "public" Skia directory in the - # webkit port. This is shared between the webkit port and Chrome. - "+webkit/port/platform/graphics/skia/public", -] - - -# checkdeps.py shouldn't check include paths for files in these dirs: -skip_child_includes = [ - "breakpad", - "gears", - "sdch", - "skia", - "testing", - "third_party", - "v8", -] +vars = {
+ "webkit_trunk":
+ "http://svn.webkit.org/repository/webkit/trunk",
+ "webkit_revision": "41181",
+}
+
+
+deps = {
+ "src/breakpad/src":
+ "http://google-breakpad.googlecode.com/svn/trunk/src@285",
+
+ "src/googleurl":
+ "http://google-url.googlecode.com/svn/trunk@96",
+
+ "src/sdch/open-vcdiff":
+ "http://open-vcdiff.googlecode.com/svn/trunk@22",
+
+ "src/testing/gtest":
+ "http://googletest.googlecode.com/svn/trunk@167",
+
+ "src/third_party/WebKit":
+ "/trunk/deps/third_party/WebKit@10283",
+
+ "src/third_party/icu38":
+ "/trunk/deps/third_party/icu38@9252",
+
+ "src/v8":
+ "http://v8.googlecode.com/svn/trunk@1266",
+
+ "src/webkit/data/layout_tests/LayoutTests":
+ Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
+
+ "src/third_party/WebKit/WebKit/mac":
+ Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"),
+
+ "src/third_party/WebKit/WebKitLibraries":
+ Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
+}
+
+
+deps_os = {
+ "win": {
+ "src/third_party/cygwin":
+ "/trunk/deps/third_party/cygwin@3248",
+
+ "src/third_party/python_24":
+ "/trunk/deps/third_party/python_24@7444",
+
+ "src/third_party/svn":
+ "/trunk/deps/third_party/svn@3230",
+ },
+ "mac": {
+ "src/third_party/GTM":
+ "http://google-toolbox-for-mac.googlecode.com/svn/trunk/@77",
+ "src/third_party/pdfsqueeze":
+ "http://pdfsqueeze.googlecode.com/svn/trunk/@2",
+ },
+}
+
+
+include_rules = [
+ # Everybody can use some things.
+ "+base",
+ "+build",
+
+ # For now, we allow ICU to be included by specifying "unicode/...", although
+ # this should probably change.
+ "+unicode",
+ "+testing",
+
+ # Allow anybody to include files from the "public" Skia directory in the
+ # webkit port. This is shared between the webkit port and Chrome.
+ "+webkit/port/platform/graphics/skia/public",
+]
+
+
+# checkdeps.py shouldn't check include paths for files in these dirs:
+skip_child_includes = [
+ "breakpad",
+ "gears",
+ "sdch",
+ "skia",
+ "testing",
+ "third_party",
+ "v8",
+]
|