From d9ca22a397f595829b06c486909e1e044f4404e2 Mon Sep 17 00:00:00 2001 From: Ian Hickson Date: Fri, 15 Apr 2016 13:18:37 -0700 Subject: [PATCH] have invokeFrameCallback print the right stack (#3351) Exception stack variable was shadowing the function argument stack. --- packages/flutter/lib/src/scheduler/scheduler.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/flutter/lib/src/scheduler/scheduler.dart b/packages/flutter/lib/src/scheduler/scheduler.dart index 17f66b420f..2c9091a2ba 100644 --- a/packages/flutter/lib/src/scheduler/scheduler.dart +++ b/packages/flutter/lib/src/scheduler/scheduler.dart @@ -296,20 +296,20 @@ abstract class Scheduler extends BindingBase { /// the error. /// /// Must not be called reentrantly from within a frame callback. - void invokeFrameCallback(FrameCallback callback, Duration timeStamp, [ StackTrace stack ]) { + void invokeFrameCallback(FrameCallback callback, Duration timeStamp, [ StackTrace callbackStack ]) { assert(callback != null); assert(_FrameCallbackEntry.currentCallbackStack == null); - assert(() { _FrameCallbackEntry.currentCallbackStack = stack; return true; }); + assert(() { _FrameCallbackEntry.currentCallbackStack = callbackStack; return true; }); try { callback(timeStamp); - } catch (exception, stack) { + } catch (exception, exceptionStack) { FlutterError.reportError(new FlutterErrorDetails( exception: exception, - stack: stack, + stack: exceptionStack, library: 'scheduler library', context: 'during a scheduler callback', - informationCollector: (stack == null) ? null : (StringBuffer information) { - information.writeln('When this callback was registered, this was the stack:\n$stack'); + informationCollector: (callbackStack == null) ? null : (StringBuffer information) { + information.writeln('When this callback was registered, this was the stack:\n$callbackStack'); } )); }