diff options
author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 15:51:18 +0000 |
---|---|---|
committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-28 15:51:18 +0000 |
commit | a69e0496c1ebae7f9474db7e148f75de31f032d3 (patch) | |
tree | 1704a738c8c563ab2fedc12b4502d9a68cc1b82f /webkit | |
parent | f5760db381b145c8ec4c3daf6ac44f6f0260da6c (diff) | |
download | chromium_src-a69e0496c1ebae7f9474db7e148f75de31f032d3.zip chromium_src-a69e0496c1ebae7f9474db7e148f75de31f032d3.tar.gz chromium_src-a69e0496c1ebae7f9474db7e148f75de31f032d3.tar.bz2 |
DevTools: enable multiple search views.
Review URL: http://codereview.chromium.org/551190
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37405 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/glue/devtools/js/debugger_agent.js | 5 | ||||
-rw-r--r-- | webkit/glue/devtools/js/devtools.js | 31 |
2 files changed, 4 insertions, 32 deletions
diff --git a/webkit/glue/devtools/js/debugger_agent.js b/webkit/glue/devtools/js/debugger_agent.js index 80b436f..28cb9c0 100644 --- a/webkit/glue/devtools/js/debugger_agent.js +++ b/webkit/glue/devtools/js/debugger_agent.js @@ -189,7 +189,10 @@ devtools.DebuggerAgent.prototype.resolveScriptSource = function( this.requestSeqToCallback_[cmd.getSequenceNumber()] = function(msg) { if (msg.isSuccess()) { var scriptJson = msg.getBody()[0]; - callback(scriptJson.source); + if (scriptJson) + callback(scriptJson.source); + else + callback(null); } else { callback(null); } diff --git a/webkit/glue/devtools/js/devtools.js b/webkit/glue/devtools/js/devtools.js index bab6bca..f2482b8 100644 --- a/webkit/glue/devtools/js/devtools.js +++ b/webkit/glue/devtools/js/devtools.js @@ -270,37 +270,6 @@ WebInspector.UnresolvedPropertyValue = function(type, className) { }; -/** - * This function overrides standard searchableViews getters to perform search - * only in the current view (other views are loaded asynchronously, no way to - * search them yet). - */ -WebInspector.searchableViews_ = function() { - var views = []; - const visibleView = this.visibleView; - if (visibleView && visibleView.performSearch) { - views.push(visibleView); - } - return views; -}; - - -/** - * @override - */ -WebInspector.ResourcesPanel.prototype.__defineGetter__( - 'searchableViews', - WebInspector.searchableViews_); - - -/** - * @override - */ -WebInspector.ScriptsPanel.prototype.__defineGetter__( - 'searchableViews', - WebInspector.searchableViews_); - - (function() { var oldShow = WebInspector.ScriptsPanel.prototype.show; WebInspector.ScriptsPanel.prototype.show = function() { |