firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

have invokeFrameCallback print the right stack (#3351)

Browse Source 
Exception stack variable was shadowing the function argument stack.
This commit is contained in:
Ian Hickson 2016-04-15 13:18:37 -07:00
parent e41c1c0b06
commit d9ca22a397
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/flutter/lib/src/scheduler/scheduler.dart
View File

@ -296,20 +296,20 @@ abstract class Scheduler extends BindingBase {
/// the error. /// the error.
/// ///
/// Must not be called reentrantly from within a frame callback. /// 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(callback != null);
assert(_FrameCallbackEntry.currentCallbackStack == null); assert(_FrameCallbackEntry.currentCallbackStack == null);
assert(() { _FrameCallbackEntry.currentCallbackStack = stack; return true; }); assert(() { _FrameCallbackEntry.currentCallbackStack = callbackStack; return true; });
try { try {
callback(timeStamp); callback(timeStamp);
} catch (exception, stack) { } catch (exception, exceptionStack) {
FlutterError.reportError(new FlutterErrorDetails( FlutterError.reportError(new FlutterErrorDetails(
exception: exception, exception: exception,
stack: stack, stack: exceptionStack,
library: 'scheduler library', library: 'scheduler library',
context: 'during a scheduler callback', context: 'during a scheduler callback',
informationCollector: (stack == null) ? null : (StringBuffer information) { informationCollector: (callbackStack == null) ? null : (StringBuffer information) {
information.writeln('When this callback was registered, this was the stack:\n$stack'); information.writeln('When this callback was registered, this was the stack:\n$callbackStack');
} }
)); ));
} }