Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Side by Side Diff: Source/WebCore/inspector/front-end/ScriptsPanel.js

Issue 7708013: Merge 93042 - Web Inspector: [V8] crash upon stepIn while not on pause. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/inspector/InspectorDebuggerAgent.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 this._stepping = false; 878 this._stepping = false;
879 this._waitingToPause = true; 879 this._waitingToPause = true;
880 DebuggerAgent.pause(); 880 DebuggerAgent.pause();
881 } 881 }
882 882
883 this._clearInterface(); 883 this._clearInterface();
884 }, 884 },
885 885
886 _stepOverClicked: function() 886 _stepOverClicked: function()
887 { 887 {
888 if (!this._paused)
889 return;
890
888 this._paused = false; 891 this._paused = false;
889 this._stepping = true; 892 this._stepping = true;
890 893
891 this._clearInterface(); 894 this._clearInterface();
892 895
893 DebuggerAgent.stepOver(); 896 DebuggerAgent.stepOver();
894 }, 897 },
895 898
896 _stepIntoClicked: function() 899 _stepIntoClicked: function()
897 { 900 {
901 if (!this._paused)
902 return;
903
898 this._paused = false; 904 this._paused = false;
899 this._stepping = true; 905 this._stepping = true;
900 906
901 this._clearInterface(); 907 this._clearInterface();
902 908
903 DebuggerAgent.stepInto(); 909 DebuggerAgent.stepInto();
904 }, 910 },
905 911
906 _stepOutClicked: function() 912 _stepOutClicked: function()
907 { 913 {
914 if (!this._paused)
915 return;
916
908 this._paused = false; 917 this._paused = false;
909 this._stepping = true; 918 this._stepping = true;
910 919
911 this._clearInterface(); 920 this._clearInterface();
912 921
913 DebuggerAgent.stepOut(); 922 DebuggerAgent.stepOut();
914 }, 923 },
915 924
916 toggleBreakpointsClicked: function() 925 toggleBreakpointsClicked: function()
917 { 926 {
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
1179 }, 1188 },
1180 1189
1181 suggestedFileName: function() 1190 suggestedFileName: function()
1182 { 1191 {
1183 var sourceFile = this._model.sourceFile(this._sourceFileId); 1192 var sourceFile = this._model.sourceFile(this._sourceFileId);
1184 return WebInspector.panels.scripts._displayNameForScriptURL(sourceFile.u rl) || "untitled.js"; 1193 return WebInspector.panels.scripts._displayNameForScriptURL(sourceFile.u rl) || "untitled.js";
1185 } 1194 }
1186 } 1195 }
1187 1196
1188 WebInspector.SourceFrameDelegateForScriptsPanel.prototype.__proto__ = WebInspect or.SourceFrameDelegate.prototype; 1197 WebInspector.SourceFrameDelegateForScriptsPanel.prototype.__proto__ = WebInspect or.SourceFrameDelegate.prototype;
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/InspectorDebuggerAgent.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698