diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebKit/chromium/src/js/DevTools.js | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebKit/chromium/src/js/DevTools.js')
-rw-r--r-- | Source/WebKit/chromium/src/js/DevTools.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/src/js/DevTools.js b/Source/WebKit/chromium/src/js/DevTools.js index 7a3eb8d..e6b7537 100644 --- a/Source/WebKit/chromium/src/js/DevTools.js +++ b/Source/WebKit/chromium/src/js/DevTools.js @@ -169,6 +169,10 @@ WebInspector.platformExtensionAPI = function(tabId) return tabId; } webInspector.inspectedWindow.__proto__.__defineGetter__("tabId", getTabId); + chrome = window.chrome || {}; + chrome.devTools = chrome.devTools || {}; + for (var property in webInspector) + chrome.devTools[property] = webInspector[property]; } WebInspector.buildPlatformExtensionAPI = function() |