Merge remote-tracking branch 'upstream/master' into performance

packages/flutter/example/game/BUILD.gn

@@ -14,5 +14,7 @@ sky_app("game") {
     deps = [
       "//sky/packages/sky/example/game/apk:resources",
     ]
+  } else if (is_ios) {
+    info_plist = "ios/Info.plist"
   }
 }

packages/flutter/example/game/ios/Info.plist

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+
+  <!--
+    This executable name must match the name of the app provided to the
+    ios_app GN template
+  -->
+  <key>CFBundleExecutable</key>
+  <string>game_app</string>
+
+  <key>CFBundleIdentifier</key>
+  <string>org.domokit.sky.game</string>
+  
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>game_app</string>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleVersion</key>
+  <string>1</string>
+  <key>LSRequiresIPhoneOS</key>
+  <true/>
+  <key>UIRequiredDeviceCapabilities</key>
+  <array>
+    <string>armv7</string>
+  </array>
+  <key>DTPlatformName</key>
+  <string>iphonesimulator</string>
+  <key>DTSDKName</key>
+  <string>iphonesimulator8.3</string>
+  <key>LSRequiresIPhoneOS</key>
+  <true/>
+  <key>MinimumOSVersion</key>
+  <string>8.3</string>
+  <key>UIDeviceFamily</key>
+  <array>
+    <integer>1</integer>
+    <integer>2</integer>
+  </array>
+  <key>CFBundleSupportedPlatforms</key>
+  <array>
+    <string>iPhoneSimulator</string>
+  </array>
+</dict>
+</plist>

packages/flutter/lib/rendering/sky_binding.dart

@@ -47,7 +47,7 @@ class SkyBinding {
       _renderView = renderViewOverride;
     }
     assert(_renderView != null);
-    scheduler.addPersistentFrameCallback(_beginFrame);
+    scheduler.addPersistentFrameCallback(beginFrame);
 
     assert(_instance == this);
   }
@@ -69,7 +69,7 @@ class SkyBinding {
   void set root(RenderBox value) {
     _renderView.child = value;
   }
-  void _beginFrame(double timeStamp) {
+  void beginFrame(double timeStamp) {
     RenderObject.flushLayout();
     RenderObject.flushPaint();
     _renderView.paintFrame();

packages/flutter/lib/widgets/widget.dart

@@ -7,6 +7,7 @@ import 'dart:collection';
 import 'dart:sky' as sky;
 
 import 'package:sky/base/hit_test.dart';
+import 'package:sky/base/scheduler.dart' as scheduler;
 import 'package:sky/mojo/activity.dart' as activity;
 import 'package:sky/rendering/box.dart';
 import 'package:sky/rendering/object.dart';
@@ -651,6 +652,11 @@ abstract class Component extends Widget {
     _scheduleComponentForRender(this);
   }
 
+  static void flushBuild() {
+    if (!_dirtyComponents.isEmpty)
+      _buildDirtyComponents();
+  }
+
   Widget build();
 
 }
@@ -759,13 +765,15 @@ void _absorbDirtyComponents(List<Component> list) {
 }
 
 void _buildDirtyComponents() {
+  assert(!_dirtyComponents.isEmpty);
+
   Stopwatch sw;
   if (_shouldLogRenderDuration)
     sw = new Stopwatch()..start();
 
   _inRenderDirtyComponents = true;
   try {
-    sky.tracing.begin('Widgets._buildDirtyComponents');
+    sky.tracing.begin('Component.flushBuild');
     List<Component> sortedDirtyComponents = new List<Component>();
     _absorbDirtyComponents(sortedDirtyComponents);
     int index = 0;
@@ -784,7 +792,7 @@ void _buildDirtyComponents() {
   } finally {
     _buildScheduled = false;
     _inRenderDirtyComponents = false;
-    sky.tracing.end('Widgets._buildDirtyComponents');
+    sky.tracing.end('Component.flushBuild');
   }
 
   Widget._notifyMountStatusChanged();
@@ -795,21 +803,20 @@ void _buildDirtyComponents() {
     if (_debugFrameTimes.length >= 1000) {
       _debugFrameTimes.sort();
       const int i = 99;
-      print('_buildDirtyComponents: ${i+1}th fastest frame out of the last ${_debugFrameTimes.length}: ${_debugFrameTimes[i]} microseconds');
+      print('Component.flushBuild: ${i+1}th fastest frame out of the last ${_debugFrameTimes.length}: ${_debugFrameTimes[i]} microseconds');
       _debugFrameTimes.clear();
     }
   }
 }
 
-void _scheduleComponentForRender(Component c) {
-  _dirtyComponents.add(c);
+void _scheduleComponentForRender(Component component) {
+  _dirtyComponents.add(component);
   if (!_buildScheduled) {
     _buildScheduled = true;
-    new Future.microtask(_buildDirtyComponents);
+    scheduler.ensureVisualUpdate();
   }
 }
 
-
 // RenderObjectWrappers correspond to a desired state of a RenderObject.
 // They are fully immutable, with one exception: A Widget which is a
 // Component which lives within an MultiChildRenderObjectWrapper's
@@ -1178,6 +1185,11 @@ class WidgetSkyBinding extends SkyBinding {
     }
   }
 
+  void beginFrame(double timeStamp) {
+    Component.flushBuild();
+    super.beginFrame(timeStamp);
+  }
+
 }
 
 abstract class App extends StatefulComponent {