Changeset 35788 in webkit
- Timestamp:
- Aug 15, 2008 10:48:36 AM (16 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r35787 r35788 1 2008-08-15 Keishi Hattori <casey.hattori@gmail.com> 2 3 Fixed Bug 20210: Console groups are incorrect when closing and reopening the Inspector 4 5 https://bugs.webkit.org/show_bug.cgi?id=20210 6 7 Reviewed by Tim Hatcher. 8 9 * page/Console.cpp: 10 (WebCore::Console::group): 11 (WebCore::Console::groupEnd): 12 * page/Console.h: 13 (WebCore::): Removed GroupTitleMessageLevel. Added StartGroupMessaageLevel and EndGroupMessageLevel. 14 * page/InspectorController.cpp: 15 (WebCore::InspectorController::startGroup): Increments group level by 16 one and adds console message with StartGroupMessaageLevel. 17 (WebCore::InspectorController::endGroup): Decrements group level by one 18 and adds console message with EndGroupMessaageLevel. 19 * page/InspectorController.h: 20 * page/inspector/Console.js: 21 (WebInspector.Console.prototype.addMessage): Creates new ConsoleGroup 22 if the message is StartGroupMessaageLevel. 23 (WebInspector.ConsoleMessage.prototype.toMessageElement): 24 (WebInspector.ConsoleGroup.prototype.addMessage): 25 * page/inspector/inspector.js: 26 1 27 2008-08-15 Keishi Hattori <casey.hattori@gmail.com> 2 28 -
trunk/WebCore/page/Console.cpp
r35787 r35788 328 328 return; 329 329 330 page->inspectorController()->startGroup(); 331 332 if (arguments.isEmpty()) 333 page->inspectorController()->addMessageToConsole(JSMessageSource, GroupTitleMessageLevel, String(), 0, String()); 334 else 335 page->inspectorController()->addMessageToConsole(JSMessageSource, GroupTitleMessageLevel, exec, arguments, 0, String()); 330 page->inspectorController()->startGroup(JSMessageSource, exec, arguments, 0, String()); 336 331 } 337 332 … … 345 340 return; 346 341 347 page->inspectorController()->endGroup( );342 page->inspectorController()->endGroup(JSMessageSource, 0, String()); 348 343 } 349 344 -
trunk/WebCore/page/Console.h
r35787 r35788 61 61 ErrorMessageLevel, 62 62 ObjectMessageLevel, 63 GroupTitleMessageLevel 63 StartGroupMessageLevel, 64 EndGroupMessageLevel 64 65 }; 65 66 -
trunk/WebCore/page/InspectorController.cpp
r35775 r35788 1280 1280 } 1281 1281 1282 void InspectorController::startGroup( )1282 void InspectorController::startGroup(MessageSource source, ExecState* exec, const ArgList& arguments, unsigned lineNumber, const String& sourceURL) 1283 1283 { 1284 JSValueRef exception = 0;1285 1286 1284 ++m_groupLevel; 1287 1285 1288 if (windowVisible()) 1289 callFunction(m_scriptContext, m_scriptObject, "startGroupInConsole", 0, NULL, exception); 1290 } 1291 1292 void InspectorController::endGroup() 1293 { 1294 JSValueRef exception = 0; 1295 1286 addConsoleMessage(new ConsoleMessage(source, StartGroupMessageLevel, exec, arguments, lineNumber, sourceURL, m_groupLevel)); 1287 } 1288 1289 void InspectorController::endGroup(MessageSource source, unsigned lineNumber, const String& sourceURL) 1290 { 1296 1291 if (m_groupLevel == 0) 1297 1292 return; … … 1299 1294 --m_groupLevel; 1300 1295 1301 if (windowVisible()) 1302 callFunction(m_scriptContext, m_scriptObject, "endGroupInConsole", 0, NULL, exception); 1296 addConsoleMessage(new ConsoleMessage(source, EndGroupMessageLevel, String(), lineNumber, sourceURL, m_groupLevel)); 1303 1297 } 1304 1298 -
trunk/WebCore/page/InspectorController.h
r35756 r35788 181 181 bool stopTiming(const KJS::UString& title, double& elapsed); 182 182 183 void startGroup( );184 void endGroup( );183 void startGroup(MessageSource source, KJS::ExecState* exec, const KJS::ArgList& arguments, unsigned lineNumber, const String& sourceURL); 184 void endGroup(MessageSource source, unsigned lineNumber, const String& sourceURL); 185 185 186 186 private: -
trunk/WebCore/page/inspector/Console.js
r35787 r35788 149 149 this.messages.push(msg); 150 150 151 if (msg.groupLevel === null) 152 msg.groupLevel = this.groupLevel 153 else { 154 while (msg.groupLevel > this.groupLevel) 155 this.startGroup(); 156 while (msg.groupLevel < this.groupLevel) 157 this.endGroup(); 158 } 159 160 this.currentGroup.addMessage(msg); 151 if (msg.level === WebInspector.ConsoleMessage.MessageLevel.EndGroup) { 152 if (this.groupLevel < 1) 153 return; 154 155 this.groupLevel--; 156 157 this.currentGroup = this.currentGroup.parentGroup; 158 } else { 159 if (msg.level === WebInspector.ConsoleMessage.MessageLevel.StartGroup) { 160 this.groupLevel++; 161 162 var group = new WebInspector.ConsoleGroup(this.currentGroup, this.groupLevel); 163 this.currentGroup.messagesElement.appendChild(group.element); 164 this.currentGroup = group; 165 } 166 167 this.currentGroup.addMessage(msg); 168 } 169 161 170 this.promptElement.scrollIntoView(false); 162 171 }, … … 224 233 225 234 return results; 226 },227 228 startGroup: function() {229 this.groupLevel++;230 231 var group = new WebInspector.ConsoleGroup(this.currentGroup, this.groupLevel);232 this.currentGroup.messagesElement.appendChild(group.element);233 this.currentGroup = group;234 },235 236 endGroup: function() {237 if (this.groupLevel < 1)238 return;239 240 this.groupLevel--;241 242 this.currentGroup = this.currentGroup.parentGroup;243 235 }, 244 236 … … 631 623 element.addStyleClass("console-error-level"); 632 624 break; 633 case WebInspector.ConsoleMessage.MessageLevel. GroupTitle:625 case WebInspector.ConsoleMessage.MessageLevel.StartGroup: 634 626 element.addStyleClass("console-group-title-level"); 635 627 } … … 724 716 Error: 3, 725 717 Object: 4, 726 GroupTitle: 5 718 StartGroup: 5, 719 EndGroup: 6 727 720 } 728 721 … … 791 784 var element = msg.toMessageElement(); 792 785 793 if (msg.level === WebInspector.ConsoleMessage.MessageLevel. GroupTitle) {786 if (msg.level === WebInspector.ConsoleMessage.MessageLevel.StartGroup) { 794 787 this.messagesElement.parentNode.insertBefore(element, this.messagesElement); 795 788 element.addEventListener("click", this._titleClicked.bind(this), true); -
trunk/WebCore/page/inspector/inspector.js
r35785 r35788 849 849 { 850 850 this.console.addMessage(msg); 851 }852 853 WebInspector.startGroupInConsole = function()854 {855 this.console.startGroup();856 }857 858 WebInspector.endGroupInConsole = function()859 {860 this.console.endGroup();861 851 } 862 852
Note: See TracChangeset
for help on using the changeset viewer.