Changeset 86672 in webkit
- Timestamp:
- May 17, 2011 7:39:09 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r86665 r86672 1 2011-05-17 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r86660. 4 http://trac.webkit.org/changeset/86660 5 https://bugs.webkit.org/show_bug.cgi?id=60958 6 7 broke search in console panel (Requested by podivilov on 8 #webkit). 9 10 * http/tests/inspector/change-iframe-src.html: 11 * http/tests/inspector/console-resource-errors.html: 12 * http/tests/inspector/inspector-test.js: 13 (initialize_InspectorTest.InspectorTest.evaluateInConsole): 14 * http/tests/inspector/network/network-size-chunked.html: 15 * http/tests/inspector/network/network-size-sync.html: 16 * http/tests/inspector/network/network-size.html: 17 * http/tests/inspector/network/network-timing.html: 18 * http/tests/inspector/resource-tree/resource-tree-frame-add.html: 19 * http/tests/inspector/resource-tree/resource-tree-frame-navigate.html: 20 * inspector/console/console-assert.html: 21 * inspector/console/console-trace-in-eval.html: 22 * inspector/console/console-trace.html: 23 * inspector/console/console-uncaught-exception.html: 24 * inspector/debugger/debugger-autocontinue-on-syntax-error.html: 25 * inspector/styles/styles-iframe.html: 26 * inspector/timeline/timeline-network-resource.html: 27 * inspector/timeline/timeline-script-tag-1.html: 28 * inspector/timeline/timeline-script-tag-2.html: 29 1 30 2011-05-12 Hans Wennborg <hans@chromium.org> 2 31 -
trunk/LayoutTests/http/tests/inspector/change-iframe-src.html
r86660 r86672 22 22 { 23 23 node.setAttribute("src", "src=\"http://localhost:8000/inspector/resources/iframe-from-different-domain-data.html\""); 24 InspectorTest. waitUntilConsoleMessageAdded(step2);24 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2); 25 25 } 26 26 -
trunk/LayoutTests/http/tests/inspector/console-resource-errors.html
r86660 r86672 28 28 function test() 29 29 { 30 InspectorTest. waitUntilConsoleMessageAdded(addMessage, true);30 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", addMessage, true); 31 31 32 32 var messageCount = 0; -
trunk/LayoutTests/http/tests/inspector/inspector-test.js
r86660 r86672 27 27 event.initKeyboardEvent("keydown", true, true, null, "Enter", ""); 28 28 WebInspector.console.promptElement.dispatchEvent(event); 29 InspectorTest. waitUntilConsoleMessageAdded(29 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", 30 30 function(commandResult) { 31 31 callback(commandResult.toMessageElement().textContent); … … 43 43 } 44 44 InspectorTest.evaluateInConsole(code, mycallback); 45 }46 47 InspectorTest.waitUntilConsoleMessageAdded = function(callback, sticky)48 {49 InspectorTest.addSniffer(WebInspector.ConsolePanel.prototype, "addMessage", callback, sticky);50 45 } 51 46 -
trunk/LayoutTests/http/tests/inspector/network/network-size-chunked.html
r86660 r86672 18 18 function test() 19 19 { 20 InspectorTest. waitUntilConsoleMessageAdded(step2);20 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2); 21 21 InspectorTest.evaluateInPage("loadImages()"); 22 22 -
trunk/LayoutTests/http/tests/inspector/network/network-size-sync.html
r86660 r86672 22 22 function test() 23 23 { 24 InspectorTest. waitUntilConsoleMessageAdded(step2);24 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2); 25 25 InspectorTest.evaluateInPage("loadData()"); 26 26 -
trunk/LayoutTests/http/tests/inspector/network/network-size.html
r86660 r86672 26 26 function test() 27 27 { 28 InspectorTest. waitUntilConsoleMessageAdded(step2);28 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2); 29 29 InspectorTest.evaluateInPage("loadImages()"); 30 30 -
trunk/LayoutTests/http/tests/inspector/network/network-timing.html
r86660 r86672 25 25 function test() 26 26 { 27 InspectorTest. waitUntilConsoleMessageAdded(step2);27 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2); 28 28 InspectorTest.evaluateInPage("loadScripts()"); 29 29 -
trunk/LayoutTests/http/tests/inspector/resource-tree/resource-tree-frame-add.html
r86660 r86672 31 31 InspectorTest.addResult("===================================="); 32 32 InspectorTest.dumpResourceTreeEverything(); 33 InspectorTest. waitUntilConsoleMessageAdded(step2);33 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2); 34 34 InspectorTest.evaluateInPage("createIframe()"); 35 35 } -
trunk/LayoutTests/http/tests/inspector/resource-tree/resource-tree-frame-navigate.html
r86660 r86672 32 32 InspectorTest.addResult("===================================="); 33 33 InspectorTest.dumpResourceTreeEverything(); 34 InspectorTest. waitUntilConsoleMessageAdded(step2);34 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2); 35 35 InspectorTest.evaluateInPage("navigateIframe()"); 36 36 } -
trunk/LayoutTests/inspector/console/console-assert.html
r86660 r86672 28 28 } 29 29 InspectorTest.evaluateInPage("setTimeout(a, 0)"); 30 InspectorTest. waitUntilConsoleMessageAdded(callback, true);30 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", callback, true); 31 31 } 32 32 -
trunk/LayoutTests/inspector/console/console-trace-in-eval.html
r86660 r86672 36 36 } 37 37 InspectorTest.evaluateInPage("doEvalSource()"); 38 InspectorTest. waitUntilConsoleMessageAdded(callback);38 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", callback); 39 39 } 40 40 -
trunk/LayoutTests/inspector/console/console-trace.html
r86660 r86672 23 23 } 24 24 InspectorTest.evaluateInPage("setTimeout(a, 0)"); 25 InspectorTest. waitUntilConsoleMessageAdded(callback);25 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", callback); 26 26 } 27 27 -
trunk/LayoutTests/inspector/console/console-uncaught-exception.html
r86660 r86672 7 7 function test() 8 8 { 9 InspectorTest. waitUntilConsoleMessageAdded(addMessage, true);9 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", addMessage, true); 10 10 InspectorTest.evaluateInPage("loadIframe()"); 11 11 function addMessage(message) -
trunk/LayoutTests/inspector/debugger/debugger-autocontinue-on-syntax-error.html
r86660 r86672 20 20 { 21 21 DebuggerAgent.setPauseOnExceptions(WebInspector.ScriptsPanel.PauseOnExceptionsState.PauseOnUncaughtExceptions); 22 InspectorTest. waitUntilConsoleMessageAdded(step2);22 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2); 23 23 InspectorTest.evaluateInPage("loadIframe()"); 24 24 } -
trunk/LayoutTests/inspector/styles/styles-iframe.html
r86660 r86672 20 20 { 21 21 InspectorTest.evaluateInPage("loadIframe()"); 22 InspectorTest. waitUntilConsoleMessageAdded(step0);22 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step0); 23 23 24 24 function step0() -
trunk/LayoutTests/inspector/timeline/timeline-network-resource.html
r86660 r86672 24 24 { 25 25 InspectorTest.evaluateInPage("performActions()"); 26 InspectorTest. waitUntilConsoleMessageAdded(step2);26 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2); 27 27 } 28 28 -
trunk/LayoutTests/inspector/timeline/timeline-script-tag-1.html
r86660 r86672 17 17 function step1() 18 18 { 19 InspectorTest. waitUntilConsoleMessageAdded(step2);19 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2); 20 20 InspectorTest.evaluateInPage("performActions()"); 21 21 } -
trunk/LayoutTests/inspector/timeline/timeline-script-tag-2.html
r86660 r86672 17 17 function step1() 18 18 { 19 InspectorTest. waitUntilConsoleMessageAdded(step2);19 InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2); 20 20 InspectorTest.evaluateInPage("performActions()"); 21 21 } -
trunk/Source/WebCore/ChangeLog
r86670 r86672 1 2011-05-17 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r86660. 4 http://trac.webkit.org/changeset/86660 5 https://bugs.webkit.org/show_bug.cgi?id=60958 6 7 broke search in console panel (Requested by podivilov on 8 #webkit). 9 10 * inspector/front-end/ConsoleView.js: 11 (WebInspector.ConsoleView.prototype.show): 12 (WebInspector.ConsoleView.prototype.afterShow): 13 (WebInspector.ConsoleView.prototype.hide): 14 (WebInspector.ConsoleView.prototype.addMessage): 15 (WebInspector.ConsoleView.prototype.clearMessages): 16 * inspector/front-end/DebuggerPresentationModel.js: 17 (WebInspector.DebuggerPresentationModel): 18 * inspector/front-end/Drawer.js: 19 (WebInspector.Drawer.prototype.set visibleView): 20 (WebInspector.Drawer.prototype.show.animationFinished): 21 (WebInspector.Drawer.prototype.show): 22 * inspector/front-end/Panel.js: 23 (WebInspector.Panel): 24 * inspector/front-end/ResourceTreeModel.js: 25 (WebInspector.ResourceTreeModel): 26 * inspector/front-end/inspector.html: 27 * inspector/front-end/inspector.js: 28 (WebInspector._createPanels): 29 1 30 2011-05-17 Alexis Menard <alexis.menard@openbossa.org> 2 31 -
trunk/Source/WebCore/inspector/front-end/ConsoleView.js
r86660 r86672 30 30 const ExpressionStopCharacters = " =:[({;,!+-*/&|^<>"; 31 31 32 WebInspector.Console Panel= function(drawer)32 WebInspector.ConsoleView = function(drawer) 33 33 { 34 WebInspector. Panel.call(this, "console", document.getElementById("console-view"));34 WebInspector.View.call(this, document.getElementById("console-view")); 35 35 36 36 this.messages = []; … … 102 102 } 103 103 104 WebInspector.Console Panel.Events = {104 WebInspector.ConsoleView.Events = { 105 105 ConsoleCleared: "console-cleared", 106 106 EntryAdded: "console-entry-added", … … 108 108 } 109 109 110 WebInspector.Console Panel.prototype = {110 WebInspector.ConsoleView.prototype = { 111 111 _registerConsoleDomainDispatcher: function() { 112 112 var console = this; … … 243 243 }, 244 244 245 get toolbarItemLabel()246 {247 return WebInspector.UIString("Console");248 },249 250 245 show: function() 251 246 { 252 WebInspector.Panel.prototype.show.call(this);253 254 this._previousConsoleState = WebInspector.drawer.state;255 WebInspector.drawer.enterPanelMode();256 WebInspector.showConsole();257 258 // Move the scope bar to the top of the messages, like the resources filter.259 var scopeBar = document.getElementById("console-filter");260 var consoleMessages = document.getElementById("console-messages");261 262 scopeBar.parentNode.removeChild(scopeBar);263 document.getElementById("console-view").insertBefore(scopeBar, consoleMessages);264 265 // Update styles, and give console-messages a top margin so it doesn't overwrite the scope bar.266 scopeBar.addStyleClass("console-filter-top");267 scopeBar.removeStyleClass("status-bar-item");268 269 consoleMessages.addStyleClass("console-filter-top");270 },271 272 hide: function()273 {274 if (this._previousConsoleState === WebInspector.Drawer.State.Hidden) {275 WebInspector.Panel.prototype.hide.call(this);276 WebInspector.drawer.immediatelyExitPanelMode();277 } else {278 if ("_toolbarItem" in this)279 this._toolbarItem.removeStyleClass("toggled-on");280 WebInspector.drawer.exitPanelMode();281 }282 delete this._previousConsoleState;283 284 // Move the scope bar back to the bottom bar, next to Clear Console.285 var scopeBar = document.getElementById("console-filter");286 287 scopeBar.parentNode.removeChild(scopeBar);288 document.getElementById("other-drawer-status-bar-items").appendChild(scopeBar);289 290 // Update styles, and remove the top margin on console-messages.291 scopeBar.removeStyleClass("console-filter-top");292 scopeBar.addStyleClass("status-bar-item");293 294 document.getElementById("console-messages").removeStyleClass("console-filter-top");295 },296 297 showInDrawer: function()298 {299 WebInspector.View.prototype.show.call(this);300 247 this.toggleConsoleButton.addStyleClass("toggled-on"); 301 248 this.toggleConsoleButton.title = WebInspector.UIString("Hide console."); … … 304 251 }, 305 252 306 afterShow InDrawer: function()253 afterShow: function() 307 254 { 308 255 WebInspector.currentFocusElement = this.promptElement; 309 256 }, 310 257 311 hide InDrawer: function()258 hide: function() 312 259 { 313 260 this.toggleConsoleButton.removeStyleClass("toggled-on"); … … 334 281 if (msg instanceof WebInspector.ConsoleMessage && !(msg instanceof WebInspector.ConsoleCommandResult)) { 335 282 this._incrementErrorWarningCount(msg); 336 this.dispatchEventToListeners(WebInspector.Console Panel.Events.MessageAdded, msg);283 this.dispatchEventToListeners(WebInspector.ConsoleView.Events.MessageAdded, msg); 337 284 this.commandSincePreviousMessage = false; 338 285 this.previousMessage = msg; … … 363 310 this._scheduleScrollIntoView(); 364 311 365 this.dispatchEventToListeners(WebInspector.Console Panel.Events.EntryAdded, msg);312 this.dispatchEventToListeners(WebInspector.ConsoleView.Events.EntryAdded, msg); 366 313 }, 367 314 … … 385 332 clearMessages: function() 386 333 { 387 this.dispatchEventToListeners(WebInspector.Console Panel.Events.ConsoleCleared);334 this.dispatchEventToListeners(WebInspector.ConsoleView.Events.ConsoleCleared); 388 335 389 336 this.messages = []; … … 731 678 } 732 679 733 WebInspector.Console Panel.prototype.__proto__ = WebInspector.Panel.prototype;680 WebInspector.ConsoleView.prototype.__proto__ = WebInspector.View.prototype; 734 681 735 682 WebInspector.ConsoleMessage = function(source, type, level, line, url, repeatCount, message, parameters, stackTrace, requestId) -
trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js
r86660 r86672 47 47 WebInspector.debuggerModel.addEventListener(WebInspector.DebuggerModel.Events.Reset, this._debuggerReset, this); 48 48 49 WebInspector.console.addEventListener(WebInspector.Console Panel.Events.MessageAdded, this._consoleMessageAdded, this);50 WebInspector.console.addEventListener(WebInspector.Console Panel.Events.ConsoleCleared, this._consoleCleared, this);49 WebInspector.console.addEventListener(WebInspector.ConsoleView.Events.MessageAdded, this._consoleMessageAdded, this); 50 WebInspector.console.addEventListener(WebInspector.ConsoleView.Events.ConsoleCleared, this._consoleCleared, this); 51 51 52 52 new WebInspector.DebuggerPresentationModelResourceBinding(this); -
trunk/Source/WebCore/inspector/front-end/Drawer.js
r86660 r86672 62 62 var firstTime = !this._visibleView; 63 63 if (this._visibleView) 64 this._visibleView.hide InDrawer();64 this._visibleView.hide(); 65 65 66 66 this._visibleView = x; … … 70 70 this._viewStatusBar.removeChildren(); // optimize this? call old.detach() 71 71 x.attach(this.element, this._viewStatusBar); 72 x.show InDrawer();72 x.show(); 73 73 this.visible = true; 74 74 } … … 93 93 94 94 if (this.visibleView) 95 this.visibleView.show InDrawer();95 this.visibleView.show(); 96 96 97 97 WebInspector.View.prototype.show.call(this); … … 125 125 if ("updateStatusBarItems" in WebInspector.currentPanel) 126 126 WebInspector.currentPanel.updateStatusBarItems(); 127 if (this.visibleView.afterShow InDrawer)128 this.visibleView.afterShow InDrawer();127 if (this.visibleView.afterShow) 128 this.visibleView.afterShow(); 129 129 delete this._animating; 130 130 delete this._currentAnimation; … … 145 145 146 146 if (this.visibleView) 147 this.visibleView.hide InDrawer();147 this.visibleView.hide(); 148 148 149 149 this._animating = true; -
trunk/Source/WebCore/inspector/front-end/Panel.js
r86660 r86672 27 27 */ 28 28 29 WebInspector.Panel = function(name , element)29 WebInspector.Panel = function(name) 30 30 { 31 WebInspector.View.call(this , element);31 WebInspector.View.call(this); 32 32 33 33 this.element.addStyleClass("panel"); -
trunk/Source/WebCore/inspector/front-end/ResourceTreeModel.js
r86660 r86672 36 36 WebInspector.networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.ResourceFinished, this._onResourceUpdated, this); 37 37 38 WebInspector.console.addEventListener(WebInspector.Console Panel.Events.MessageAdded, this._consoleMessageAdded, this);39 WebInspector.console.addEventListener(WebInspector.Console Panel.Events.ConsoleCleared, this._consoleCleared, this);38 WebInspector.console.addEventListener(WebInspector.ConsoleView.Events.MessageAdded, this._consoleMessageAdded, this); 39 WebInspector.console.addEventListener(WebInspector.ConsoleView.Events.ConsoleCleared, this._consoleCleared, this); 40 40 41 41 this.frontendReused(); -
trunk/Source/WebCore/inspector/front-end/inspector.html
r86660 r86672 58 58 <script type="text/javascript" src="View.js"></script> 59 59 <script type="text/javascript" src="Drawer.js"></script> 60 <script type="text/javascript" src="ConsoleView.js"></script> 60 61 <script type="text/javascript" src="Panel.js"></script> 61 62 <script type="text/javascript" src="TimelineGrid.js"></script> … … 107 108 <script type="text/javascript" src="ResourcesPanel.js"></script> 108 109 <script type="text/javascript" src="ProfilesPanel.js"></script> 109 <script type="text/javascript" src="Console View.js"></script>110 <script type="text/javascript" src="ConsolePanel.js"></script> 110 111 <script type="text/javascript" src="ExtensionAPI.js"></script> 111 112 <script type="text/javascript" src="ExtensionAuditCategory.js"></script> -
trunk/Source/WebCore/inspector/front-end/inspector.js
r86660 r86672 152 152 }, 153 153 154 _createPanels: function( hiddenPanels)154 _createPanels: function() 155 155 { 156 156 if (WebInspector.WorkerManager.isWorkerFrontend()) { … … 159 159 return; 160 160 } 161 var hiddenPanels = (InspectorFrontendHost.hiddenPanels() || "").split(','); 161 162 if (hiddenPanels.indexOf("elements") === -1) 162 163 this.panels.elements = new WebInspector.ElementsPanel(); … … 173 174 if (hiddenPanels.indexOf("audits") === -1) 174 175 this.panels.audits = new WebInspector.AuditsPanel(); 176 if (hiddenPanels.indexOf("console") === -1) 177 this.panels.console = new WebInspector.ConsolePanel(); 175 178 }, 176 179 … … 415 418 416 419 this.drawer = new WebInspector.Drawer(); 417 this.console = new WebInspector.Console Panel(this.drawer);420 this.console = new WebInspector.ConsoleView(this.drawer); 418 421 this.drawer.visibleView = this.console; 419 422 this.networkManager = new WebInspector.NetworkManager(); … … 440 443 this.domBreakpointsSidebarPane = new WebInspector.DOMBreakpointsSidebarPane(); 441 444 442 var hiddenPanels = (InspectorFrontendHost.hiddenPanels() || "").split(',');443 445 this.panels = {}; 444 this._createPanels(hiddenPanels); 445 if (hiddenPanels.indexOf("console") === -1) 446 this.panels.console = this.console; 447 446 this._createPanels(); 448 447 this._panelHistory = new WebInspector.PanelHistory(); 449 448 this.toolbar = new WebInspector.Toolbar();
Note: See TracChangeset
for help on using the changeset viewer.