summaryrefslogtreecommitdiffstats
path: root/webkit/webkit.gyp
diff options
context:
space:
mode:
authoramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-10 20:01:12 +0000
committeramanda@chromium.org <amanda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-10 20:01:12 +0000
commit80605380f9f65f0c1c4fef6537372f44d94d180a (patch)
treeb97bb287d91e22a61ebd949082845127d1c1e114 /webkit/webkit.gyp
parentf40fa47a03452d4659e1d47f0408bcdef6764705 (diff)
downloadchromium_src-80605380f9f65f0c1c4fef6537372f44d94d180a.zip
chromium_src-80605380f9f65f0c1c4fef6537372f44d94d180a.tar.gz
chromium_src-80605380f9f65f0c1c4fef6537372f44d94d180a.tar.bz2
Roll WebKit to 46977, fold in http://codereview.chromium.org/164247
in order to fix interactive UI test failures that result. BUG=18939 TEST=none Review URL: http://codereview.chromium.org/165243 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
-rw-r--r--webkit/webkit.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index c072275..5b92997 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1557,6 +1557,7 @@
'../third_party/WebKit/WebCore/inspector/front-end/MetricsSidebarPane.js',
'../third_party/WebKit/WebCore/inspector/front-end/Object.js',
'../third_party/WebKit/WebCore/inspector/front-end/ObjectPropertiesSection.js',
+ '../third_party/WebKit/WebCore/inspector/front-end/ObjectProxy.js',
'../third_party/WebKit/WebCore/inspector/front-end/Panel.js',
'../third_party/WebKit/WebCore/inspector/front-end/PanelEnablerView.js',
'../third_party/WebKit/WebCore/inspector/front-end/Placard.js',