diff options
| author | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 08:37:08 +0000 |
|---|---|---|
| committer | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 08:37:08 +0000 |
| commit | 31584b27d7956971710d50ffba70f00f5ea9433e (patch) | |
| tree | d6afcee74f5eedd0c7a26382056075803310f972 /webkit/webkit.gyp | |
| parent | bd58cd62e38a63c830cd2ed242ef7e726f80c690 (diff) | |
| download | chromium_src-31584b27d7956971710d50ffba70f00f5ea9433e.zip chromium_src-31584b27d7956971710d50ffba70f00f5ea9433e.tar.gz chromium_src-31584b27d7956971710d50ffba70f00f5ea9433e.tar.bz2 | |
Revert "DevTools: switch to upstreamed version of DevTools *.js files"
TBR=pfeldman
Review URL: http://codereview.chromium.org/602019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 631b6a3..fbc5f8b 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -5,7 +5,6 @@ { 'includes': [ '../third_party/WebKit/WebKit/chromium/features.gypi', - '../third_party/WebKit/WebKit/chromium/WebKit.gypi', '../third_party/WebKit/WebCore/WebCore.gypi', ], 'variables': { @@ -23,7 +22,9 @@ # List of DevTools source files, ordered by dependencies. It is used both # for copying them to resource dir, and for generating 'devtools.html' file. 'devtools_files': [ - '<@(devtools_css_files)', + 'glue/devtools/js/devtools.css', + 'glue/devtools/js/inspector_controller_impl.js', + 'glue/devtools/js/debugger_agent.js', '../v8/tools/codemap.js', '../v8/tools/consarray.js', '../v8/tools/csvparser.js', @@ -31,7 +32,12 @@ '../v8/tools/profile.js', '../v8/tools/profile_view.js', '../v8/tools/splaytree.js', - '<@(devtools_js_files)', + 'glue/devtools/js/profiler_agent.js', + 'glue/devtools/js/profiler_processor.js', + 'glue/devtools/js/heap_profiler_panel.js', + 'glue/devtools/js/devtools.js', + 'glue/devtools/js/devtools_host_stub.js', + 'glue/devtools/js/tests.js', ], 'debug_devtools%': 0, @@ -477,8 +483,19 @@ { 'destination': '<(PRODUCT_DIR)/resources/inspector/Images', 'files': [ - '<@(webinspector_image_files)', - '<@(devtools_image_files)', + + '<@(webinspector_image_files)', + + 'glue/devtools/js/Images/segmentChromium.png', + 'glue/devtools/js/Images/segmentHoverChromium.png', + 'glue/devtools/js/Images/segmentHoverEndChromium.png', + 'glue/devtools/js/Images/segmentSelectedChromium.png', + 'glue/devtools/js/Images/segmentSelectedEndChromium.png', + 'glue/devtools/js/Images/statusbarBackgroundChromium.png', + 'glue/devtools/js/Images/statusbarBottomBackgroundChromium.png', + 'glue/devtools/js/Images/statusbarButtonsChromium.png', + 'glue/devtools/js/Images/statusbarMenuButtonChromium.png', + 'glue/devtools/js/Images/statusbarMenuButtonSelectedChromium.png', ], }, ], |