Commit 9d86ac5e authored by Florian Loitsch's avatar Florian Loitsch

Merge pull request #664 from floitschG/scheduler.renames

Rename some of the functions from the scheduler.
parents c13fe8eb 72821152
...@@ -40,7 +40,7 @@ class Ticker { ...@@ -40,7 +40,7 @@ class Ticker {
_startTime = null; _startTime = null;
if (_animationId != null) { if (_animationId != null) {
scheduler.cancelAnimationFrame(_animationId); scheduler.cancelFrameCallbackWithId(_animationId);
_animationId = null; _animationId = null;
} }
...@@ -74,6 +74,6 @@ class Ticker { ...@@ -74,6 +74,6 @@ class Ticker {
void _scheduleTick() { void _scheduleTick() {
assert(isTicking); assert(isTicking);
assert(_animationId == null); assert(_animationId == null);
_animationId = scheduler.requestAnimationFrame(_tick); _animationId = scheduler.scheduleFrameCallback(_tick);
} }
} }
...@@ -55,7 +55,7 @@ class HeroController extends NavigatorObserver { ...@@ -55,7 +55,7 @@ class HeroController extends NavigatorObserver {
void _checkForHeroQuest() { void _checkForHeroQuest() {
if (_from != null && _to != null && _from != _to) { if (_from != null && _to != null && _from != _to) {
_to.offstage = _to.performance.status != PerformanceStatus.completed; _to.offstage = _to.performance.status != PerformanceStatus.completed;
scheduler.requestPostFrameCallback(_updateQuest); scheduler.addPostFrameCallback(_updateQuest);
} }
} }
......
...@@ -361,7 +361,7 @@ class SpriteBox extends RenderBox { ...@@ -361,7 +361,7 @@ class SpriteBox extends RenderBox {
// Updates // Updates
void _scheduleTick() { void _scheduleTick() {
scheduler.requestAnimationFrame(_tick); scheduler.scheduleFrameCallback(_tick);
} }
void _tick(Duration timeStamp) { void _tick(Duration timeStamp) {
......
...@@ -34,7 +34,8 @@ class WidgetTester { ...@@ -34,7 +34,8 @@ class WidgetTester {
void pump([ Duration duration ]) { void pump([ Duration duration ]) {
if (duration != null) if (duration != null)
async.elapse(duration); async.elapse(duration);
scheduler.beginFrame(new Duration(milliseconds: clock.now().millisecondsSinceEpoch)); scheduler.handleBeginFrame(new Duration(
milliseconds: clock.now().millisecondsSinceEpoch));
async.flushMicrotasks(); async.flushMicrotasks();
} }
......
...@@ -17,7 +17,7 @@ void main() { ...@@ -17,7 +17,7 @@ void main() {
expect(secondCallbackRan, isFalse); expect(secondCallbackRan, isFalse);
expect(timeStamp.inMilliseconds, equals(16)); expect(timeStamp.inMilliseconds, equals(16));
firstCallbackRan = true; firstCallbackRan = true;
scheduler.cancelAnimationFrame(secondId); scheduler.cancelFrameCallbackWithId(secondId);
} }
void secondCallback(Duration timeStamp) { void secondCallback(Duration timeStamp) {
...@@ -27,10 +27,10 @@ void main() { ...@@ -27,10 +27,10 @@ void main() {
secondCallbackRan = true; secondCallbackRan = true;
} }
scheduler.requestAnimationFrame(firstCallback); scheduler.scheduleFrameCallback(firstCallback);
secondId = scheduler.requestAnimationFrame(secondCallback); secondId = scheduler.scheduleFrameCallback(secondCallback);
scheduler.beginFrame(const Duration(milliseconds: 16)); scheduler.handleBeginFrame(const Duration(milliseconds: 16));
expect(firstCallbackRan, isTrue); expect(firstCallbackRan, isTrue);
expect(secondCallbackRan, isFalse); expect(secondCallbackRan, isFalse);
...@@ -38,7 +38,7 @@ void main() { ...@@ -38,7 +38,7 @@ void main() {
firstCallbackRan = false; firstCallbackRan = false;
secondCallbackRan = false; secondCallbackRan = false;
scheduler.beginFrame(const Duration(milliseconds: 32)); scheduler.handleBeginFrame(const Duration(milliseconds: 32));
expect(firstCallbackRan, isFalse); expect(firstCallbackRan, isFalse);
expect(secondCallbackRan, isFalse); expect(secondCallbackRan, isFalse);
......
...@@ -28,17 +28,17 @@ void main() { ...@@ -28,17 +28,17 @@ void main() {
scheduleAddingTask(x); scheduleAddingTask(x);
} }
strategy.allowedPriority = 100; strategy.allowedPriority = 100;
for (int i = 0; i < 3; i++) scheduler.tick(); for (int i = 0; i < 3; i++) scheduler.handleEventLoopCallback();
expect(executedTasks.isEmpty, isTrue); expect(executedTasks.isEmpty, isTrue);
strategy.allowedPriority = 50; strategy.allowedPriority = 50;
for (int i = 0; i < 3; i++) scheduler.tick(); for (int i = 0; i < 3; i++) scheduler.handleEventLoopCallback();
expect(executedTasks.length, equals(1)); expect(executedTasks.length, equals(1));
expect(executedTasks.single, equals(80)); expect(executedTasks.single, equals(80));
executedTasks.clear(); executedTasks.clear();
strategy.allowedPriority = 20; strategy.allowedPriority = 20;
for (int i = 0; i < 3; i++) scheduler.tick(); for (int i = 0; i < 3; i++) scheduler.handleEventLoopCallback();
expect(executedTasks.length, equals(2)); expect(executedTasks.length, equals(2));
expect(executedTasks[0], equals(23)); expect(executedTasks[0], equals(23));
expect(executedTasks[1], equals(23)); expect(executedTasks[1], equals(23));
...@@ -48,21 +48,21 @@ void main() { ...@@ -48,21 +48,21 @@ void main() {
scheduleAddingTask(19); scheduleAddingTask(19);
scheduleAddingTask(5); scheduleAddingTask(5);
scheduleAddingTask(97); scheduleAddingTask(97);
for (int i = 0; i < 3; i++) scheduler.tick(); for (int i = 0; i < 3; i++) scheduler.handleEventLoopCallback();
expect(executedTasks.length, equals(2)); expect(executedTasks.length, equals(2));
expect(executedTasks[0], equals(99)); expect(executedTasks[0], equals(99));
expect(executedTasks[1], equals(97)); expect(executedTasks[1], equals(97));
executedTasks.clear(); executedTasks.clear();
strategy.allowedPriority = 10; strategy.allowedPriority = 10;
for (int i = 0; i < 3; i++) scheduler.tick(); for (int i = 0; i < 3; i++) scheduler.handleEventLoopCallback();
expect(executedTasks.length, equals(2)); expect(executedTasks.length, equals(2));
expect(executedTasks[0], equals(19)); expect(executedTasks[0], equals(19));
expect(executedTasks[1], equals(11)); expect(executedTasks[1], equals(11));
executedTasks.clear(); executedTasks.clear();
strategy.allowedPriority = 1; strategy.allowedPriority = 1;
for (int i = 0; i < 4; i++) scheduler.tick(); for (int i = 0; i < 4; i++) scheduler.handleEventLoopCallback();
expect(executedTasks.length, equals(3)); expect(executedTasks.length, equals(3));
expect(executedTasks[0], equals(5)); expect(executedTasks[0], equals(5));
expect(executedTasks[1], equals(3)); expect(executedTasks[1], equals(3));
...@@ -70,7 +70,7 @@ void main() { ...@@ -70,7 +70,7 @@ void main() {
executedTasks.clear(); executedTasks.clear();
strategy.allowedPriority = 0; strategy.allowedPriority = 0;
scheduler.tick(); scheduler.handleEventLoopCallback();
expect(executedTasks.length, equals(1)); expect(executedTasks.length, equals(1));
expect(executedTasks[0], equals(0)); expect(executedTasks[0], equals(0));
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment