summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-24 13:31:40 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-24 13:31:40 +0000
commit60186f4ffb00d95490062855210203461019efc5 (patch)
treef0dd52629b913c229ec1d5f12ee9696dded0ceea /webkit
parent8f718c9e7ad5e5649da5c6c19ae08664acc6f391 (diff)
downloadchromium_src-60186f4ffb00d95490062855210203461019efc5.zip
chromium_src-60186f4ffb00d95490062855210203461019efc5.tar.gz
chromium_src-60186f4ffb00d95490062855210203461019efc5.tar.bz2
Revert "DevTools: repair on linux and reenable breakpoint tests" revision 27060.
Caused regression on Webkit Mac10.5 and Webkit Linux (dbg)(3) TBR=yurys TEST=none BUG=none Review URL: http://codereview.chromium.org/225027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27062 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/devtools/js/tests.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/webkit/glue/devtools/js/tests.js b/webkit/glue/devtools/js/tests.js
index 7c241ad..8fced0b 100644
--- a/webkit/glue/devtools/js/tests.js
+++ b/webkit/glue/devtools/js/tests.js
@@ -520,10 +520,7 @@ TestSuite.prototype.showMainPageScriptSource_ = function(scriptName, callback) {
'Unexpected number of scripts(' + test.optionsToString_(options) + ')');
// Select page's script if it's not current option.
- var scriptResource;
- if (options[scriptSelect.selectedIndex].text === scriptName) {
- scriptResource = options[scriptSelect.selectedIndex].representedObject;
- } else {
+ if (options[scriptSelect.selectedIndex].text !== scriptName) {
var pageScriptIndex = -1;
for (var i = 0; i < options.length; i++) {
if (options[i].text === scriptName) {
@@ -534,13 +531,12 @@ 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.');