diff options
author | yurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 14:00:41 +0000 |
---|---|---|
committer | yurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 14:00:41 +0000 |
commit | 6cd7fa666ca85db66bc124f92b4e3bf06b36c768 (patch) | |
tree | 3a015b252594dece12ab5d7ed8e27818d2ab4236 /webkit | |
parent | 60186f4ffb00d95490062855210203461019efc5 (diff) | |
download | chromium_src-6cd7fa666ca85db66bc124f92b4e3bf06b36c768.zip chromium_src-6cd7fa666ca85db66bc124f92b4e3bf06b36c768.tar.gz chromium_src-6cd7fa666ca85db66bc124f92b4e3bf06b36c768.tar.bz2 |
Reverting 27062 since "DevTools: repair on linux and reenable breakpoint tests" revision 27060 was not the cause of regression on Webkit Mac10.5 and Webkit Linux (dbg)(3)
TBR=maruel
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/231016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/glue/devtools/js/tests.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/glue/devtools/js/tests.js b/webkit/glue/devtools/js/tests.js index 8fced0b..7c241ad 100644 --- a/webkit/glue/devtools/js/tests.js +++ b/webkit/glue/devtools/js/tests.js @@ -520,7 +520,10 @@ TestSuite.prototype.showMainPageScriptSource_ = function(scriptName, callback) { 'Unexpected number of scripts(' + test.optionsToString_(options) + ')'); // Select page's script if it's not current option. - if (options[scriptSelect.selectedIndex].text !== scriptName) { + var scriptResource; + if (options[scriptSelect.selectedIndex].text === scriptName) { + scriptResource = options[scriptSelect.selectedIndex].representedObject; + } else { var pageScriptIndex = -1; for (var i = 0; i < options.length; i++) { if (options[i].text === scriptName) { @@ -531,12 +534,13 @@ TestSuite.prototype.showMainPageScriptSource_ = function(scriptName, callback) { test.assertTrue(-1 !== pageScriptIndex, 'Script with url ' + scriptName + ' not found among ' + test.optionsToString_(options)); + scriptResource = options[pageScriptIndex].representedObject; + // Current panel is 'Scripts'. WebInspector.currentPanel._showScriptOrResource(scriptResource); test.assertEquals(pageScriptIndex, scriptSelect.selectedIndex, 'Unexpected selected option index.'); } - var scriptResource = options[scriptSelect.selectedIndex].representedObject; test.assertTrue(scriptResource instanceof WebInspector.Resource, 'Unexpected resource class.'); |