diff options
| author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-08 10:23:47 +0000 |
|---|---|---|
| committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-08 10:23:47 +0000 |
| commit | c61169b6fb6372e1889fef5465b22d478c92337f (patch) | |
| tree | bc1168bbca7bda837ee8dd7ec502062b5c2b5873 | |
| parent | e7f0364cfee9e3c0034bdb788410258c02d55468 (diff) | |
| download | chromium_src-c61169b6fb6372e1889fef5465b22d478c92337f.zip chromium_src-c61169b6fb6372e1889fef5465b22d478c92337f.tar.gz chromium_src-c61169b6fb6372e1889fef5465b22d478c92337f.tar.bz2 | |
Roll WebKit DEPS and adjust references to WebCore.
Review URL: http://codereview.chromium.org/6087014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70844 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 6 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 18 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.gypi | 2 |
3 files changed, 13 insertions, 13 deletions
@@ -4,7 +4,7 @@ vars = { "googlecode_url": "http://%s.googlecode.com/svn", "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "75312", + "webkit_revision": "75315", "skia_revision": "673", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", @@ -78,8 +78,8 @@ deps = { "src/third_party/WebKit/Source/JavaScriptCore": Var("webkit_trunk") + "/Source/JavaScriptCore@" + Var("webkit_revision"), - "src/third_party/WebKit/WebCore": - Var("webkit_trunk") + "/WebCore@" + Var("webkit_revision"), + "src/third_party/WebKit/Source/WebCore": + Var("webkit_trunk") + "/Source/WebCore@" + Var("webkit_revision"), "src/third_party/WebKit/WebKit/chromium": Var("webkit_trunk") + "/WebKit/chromium@" + Var("webkit_revision"), diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 89809ff..eb41a66 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -586,7 +586,7 @@ # See the comment in this section of the unit_tests target for an # explanation (crbug.com/43791 - libwebcore.a is too large to mmap). 'dependencies+++': [ - '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', + '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore', ], 'sources!': [ # ProcessSingletonMac doesn't do anything. @@ -1860,7 +1860,7 @@ # Enough pluses to make get this target prepended to the target's # list of dependencies. 'dependencies+++': [ - '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', + '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore', ], }, { # OS != "mac" 'dependencies': [ @@ -2300,7 +2300,7 @@ # See the comment in this section of the unit_tests target for an # explanation (crbug.com/43791 - libwebcore.a is too large to mmap). 'dependencies+++': [ - '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', + '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore', ], 'sources': [ 'renderer/external_popup_menu_unittest.cc', @@ -2396,7 +2396,7 @@ ['OS=="mac"', { # See crbug.com/43791 - libwebcore.a is too large to mmap on Mac. 'dependencies+++': [ - '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', + '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore', ], # These flags are needed to run the test on Mac. # Search for comments about "xcode_settings" elsewhere in this file. @@ -2447,7 +2447,7 @@ # See the comment in this section of the unit_tests target for an # explanation (crbug.com/43791 - libwebcore.a is too large to mmap). 'dependencies+++': [ - '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', + '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore', ], }], ['OS=="win"', { @@ -2808,7 +2808,7 @@ # See the comment in this section of the unit_tests target for an # explanation (crbug.com/43791 - libwebcore.a is too large to mmap). 'dependencies+++': [ - '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', + '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore', ], 'dependencies': [ 'helper_app' @@ -2933,7 +2933,7 @@ # See the comment in this section of the unit_tests target for an # explanation (crbug.com/43791 - libwebcore.a is too large to mmap). 'dependencies+++': [ - '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', + '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore', ], # The sync_integration_tests do not run on mac without this flag. # Search for comments about "xcode_settings" elsewhere in this file. @@ -3065,7 +3065,7 @@ # See the comment in this section of the unit_tests target for an # explanation (crbug.com/43791 - libwebcore.a is too large to mmap). 'dependencies+++': [ - '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', + '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore', ], # See comments about "xcode_settings" elsewhere in this file. 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, @@ -3407,7 +3407,7 @@ # explanation (crbug.com/43791 - libwebcore.a is too large to # mmap). 'dependencies+++': [ - '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore', + '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore', ], 'include_dirs': [ '..', diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi index 697ca8f..e64f667 100644 --- a/webkit/glue/webkit_glue.gypi +++ b/webkit/glue/webkit_glue.gypi @@ -121,7 +121,7 @@ 'action_name': 'webkit_version', 'inputs': [ '../build/webkit_version.py', - '<(webkit_src_dir)/WebCore/Configurations/Version.xcconfig', + '<(webkit_src_dir)/Source/WebCore/Configurations/Version.xcconfig', ], 'outputs': [ '<(INTERMEDIATE_DIR)/webkit_version.h', |