diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 22:56:18 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-03 22:56:18 +0000 |
| commit | 9e746269d1b2f2f9afd9f28148f197c40c06fb55 (patch) | |
| tree | aad85733f98c4c7081b7ee7fa5ac5aba33e1b396 | |
| parent | aa078b67d3d8e976ffeee26e2dcccb6e938b7008 (diff) | |
| download | chromium_src-9e746269d1b2f2f9afd9f28148f197c40c06fb55.zip chromium_src-9e746269d1b2f2f9afd9f28148f197c40c06fb55.tar.gz chromium_src-9e746269d1b2f2f9afd9f28148f197c40c06fb55.tar.bz2 | |
WebKit merge from 46726 to 46732 to unbreak the canary bots.
r46732 upstream renamed some inspector JS files so we need to
update the list on our side (we should probably try to move
this into WebCore.gypi).
Review URL: http://codereview.chromium.org/160548
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22333 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "46726", + "webkit_revision": "46732", } diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index e00bc75..85505ae 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -1512,12 +1512,14 @@ '../third_party/WebKit/WebCore/inspector/front-end/Breakpoint.js', '../third_party/WebKit/WebCore/inspector/front-end/BreakpointsSidebarPane.js', '../third_party/WebKit/WebCore/inspector/front-end/CallStackSidebarPane.js', - '../third_party/WebKit/WebCore/inspector/front-end/Console.js', + '../third_party/WebKit/WebCore/inspector/front-end/ConsoleView.js', + '../third_party/WebKit/WebCore/inspector/front-end/ChangesView.js', '../third_party/WebKit/WebCore/inspector/front-end/Database.js', '../third_party/WebKit/WebCore/inspector/front-end/DatabaseQueryView.js', '../third_party/WebKit/WebCore/inspector/front-end/DatabasesPanel.js', '../third_party/WebKit/WebCore/inspector/front-end/DatabaseTableView.js', '../third_party/WebKit/WebCore/inspector/front-end/DataGrid.js', + '../third_party/WebKit/WebCore/inspector/front-end/Drawer.js', '../third_party/WebKit/WebCore/inspector/front-end/ElementsPanel.js', '../third_party/WebKit/WebCore/inspector/front-end/ElementsTreeOutline.js', '../third_party/WebKit/WebCore/inspector/front-end/FontView.js', |