Chromium Code Reviews| Index: runtime/observatory/lib/src/elements/debugger.dart |
| diff --git a/runtime/observatory/lib/src/elements/debugger.dart b/runtime/observatory/lib/src/elements/debugger.dart |
| index cf78a267cd85c2ec92e923f2f5b3a87b6138fdf0..dd4cfbea33dc6846ccf06efb35afdbc94b246feb 100644 |
| --- a/runtime/observatory/lib/src/elements/debugger.dart |
| +++ b/runtime/observatory/lib/src/elements/debugger.dart |
| @@ -1067,28 +1067,6 @@ class InfoCommand extends DebuggerCommand { |
| 'Syntax: info <subcommand>\n'; |
| } |
| -class RefreshCoverageCommand extends DebuggerCommand { |
| - RefreshCoverageCommand(Debugger debugger) : super(debugger, 'coverage', []); |
| - |
| - Future run(List<String> args) { |
| - Set<Script> scripts = debugger.stackElement.activeScripts(); |
| - List pending = []; |
| - for (var script in scripts) { |
| - pending.add(script.refreshCoverage().then((_) { |
| - debugger.console.print('Refreshed coverage for ${script.name}'); |
| - })); |
| - } |
| - return Future.wait(pending); |
| - } |
| - |
| - String helpShort = 'Refresh code coverage information for current frames'; |
| - |
| - String helpLong = |
| - 'Refresh code coverage information for current frames.\n' |
| - '\n' |
| - 'Syntax: refresh coverage\n\n'; |
| -} |
| - |
| class RefreshStackCommand extends DebuggerCommand { |
| RefreshStackCommand(Debugger debugger) : super(debugger, 'stack', []); |
| @@ -1106,7 +1084,6 @@ class RefreshStackCommand extends DebuggerCommand { |
| class RefreshCommand extends DebuggerCommand { |
| RefreshCommand(Debugger debugger) : super(debugger, 'refresh', [ |
| - new RefreshCoverageCommand(debugger), |
| new RefreshStackCommand(debugger), |
| ]); |
| @@ -1896,6 +1873,7 @@ class DebuggerPageElement extends ObservatoryElement { |
| var stackElement = $['stackElement']; |
| debugger.stackElement = stackElement; |
| stackElement.debugger = debugger; |
| + stackElement.scroller = $['stackDiv']; |
| debugger.console = $['console']; |
| debugger.input = $['commandline']; |
| debugger.input.debugger = debugger; |
| @@ -1952,7 +1930,8 @@ class DebuggerPageElement extends ObservatoryElement { |
| var splitterDiv = $['splitterDiv']; |
| var cmdDiv = $['commandDiv']; |
| - int navbarHeight = navbarDiv.clientHeight; |
| + // For now, force navbar height to 40px in the debugger. |
| + int navbarHeight = 40; |
|
Cutch
2016/01/14 21:37:40
This is also hard coded in script_inset.dart can y
turnidge
2016/01/15 18:37:03
Done.
|
| int splitterHeight = splitterDiv.clientHeight; |
| int cmdHeight = cmdDiv.clientHeight; |
| @@ -1960,6 +1939,7 @@ class DebuggerPageElement extends ObservatoryElement { |
| int fixedHeight = navbarHeight + splitterHeight + cmdHeight; |
| int available = windowHeight - fixedHeight; |
| int stackHeight = available ~/ 1.6; |
| + navbarDiv.style.setProperty('height', '${navbarHeight}px'); |
| stackDiv.style.setProperty('height', '${stackHeight}px'); |
| } |
| @@ -1987,6 +1967,7 @@ class DebuggerPageElement extends ObservatoryElement { |
| @CustomTag('debugger-stack') |
| class DebuggerStackElement extends ObservatoryElement { |
| @published Isolate isolate; |
| + @published Element scroller; |
| @observable bool hasStack = false; |
| @observable bool hasMessages = false; |
| @observable bool isSampled = false; |
| @@ -1996,6 +1977,7 @@ class DebuggerStackElement extends ObservatoryElement { |
| _addFrame(List frameList, Frame frameInfo) { |
| DebuggerFrameElement frameElement = new Element.tag('debugger-frame'); |
| frameElement.frame = frameInfo; |
| + frameElement.scroller = scroller; |
| if (frameInfo.index == currentFrame) { |
| frameElement.setCurrent(true); |
| @@ -2122,15 +2104,6 @@ class DebuggerStackElement extends ObservatoryElement { |
| } |
| } |
| - Set<Script> activeScripts() { |
| - var s = new Set<Script>(); |
| - List frameElements = $['frameList'].children; |
| - for (var frameElement in frameElements) { |
| - s.add(frameElement.children[0].script); |
| - } |
| - return s; |
| - } |
| - |
| Future doPauseIsolate() { |
| if (debugger != null) { |
| return debugger.isolate.pause(); |
| @@ -2153,6 +2126,7 @@ class DebuggerStackElement extends ObservatoryElement { |
| @CustomTag('debugger-frame') |
| class DebuggerFrameElement extends ObservatoryElement { |
| @published Frame frame; |
| + @published Element scroller; |
| // Is this the current frame? |
| bool _current = false; |