Merge pull request #18 from Unity-Technologies/zxw/skiaBase

fix some other compile errors

com.unity.uiwidgets/Editor/UIWidgetsPanelEditor.cs

 using Unity.UIWidgets.engine;
+using Unity.UIWidgets.engine2;
 using UnityEditor;
 using UnityEditor.UI;
 

com.unity.uiwidgets/Runtime/engine/UIWidgetsPanel.cs

-using System.Collections.Generic;
+/*using System.Collections.Generic;
 using Unity.UIWidgets.async;
 using Unity.UIWidgets.editor;
 using Unity.UIWidgets.external.simplejson;
             get { return _windowAdapter; }
         }
     }
-}
+}*/

com.unity.uiwidgets/Runtime/engine/raycastable/UIWidgetsRaycastablePanel.cs

-using Unity.UIWidgets.engine;
+/*using Unity.UIWidgets.engine;
 using UnityEngine;
 
 namespace Unity.UIWidgets.engine.raycast {
             return !RaycastManager.CheckCastThrough(windowHashCode, local);
         }
     }
-}
+}*/

com.unity.uiwidgets/Runtime/material/colors.cs

 namespace Unity.UIWidgets.material {
     public class MaterialColor : ColorSwatch<int> {
         public MaterialColor(
-            long primary,
+            uint primary,
             Dictionary<int, Color> swatch) : base(primary: primary, swatch: swatch) {
         }
 
 
     public class MaterialAccentColor : ColorSwatch<int> {
         public MaterialAccentColor(
-            long primary,
+            uint primary,
             Dictionary<int, Color> swatch) : base(primary: primary, swatch: swatch) {
         }
 

com.unity.uiwidgets/Runtime/rendering/editable.cs

                     break;
                 case KeyCommand.Paste:
                     TextEditingValue value = textSelectionDelegate.textEditingValue;
-                    Clipboard.getData(Clipboard.kTextPlain).Then(data => {
+                    Clipboard.getData(Clipboard.kTextPlain).then_(data => {
                         if (data != null) {
                             textSelectionDelegate.textEditingValue = new TextEditingValue(
                                 text: value.selection.textBefore(value.text)

com.unity.uiwidgets/Runtime/service/clipboard.cs

 using System.Runtime.InteropServices;
-using RSG;
+using Unity.UIWidgets.async2;
 using UnityEngine;
 
 namespace Unity.UIWidgets.service {
             GUIUtility.systemCopyBuffer = data.text;
 #endif
             
-            return Promise.Resolved();
+            return Future.value();
-            return Promise<ClipboardData>.Resolved(data);
+            return Future.value(FutureOr.value(data)).to<ClipboardData>();
         }
         
 #if UNITY_WEBGL

com.unity.uiwidgets/Runtime/service/keyboard.cs

+
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
         }
 
         public void setIMEPos(Offset imeGlobalPos) {
-            var uiWidgetWindowAdapter = Window.instance as UIWidgetWindowAdapter;
+            var uiWidgetWindowAdapter = Window.instance;
             Offset screenPos = uiWidgetWindowAdapter != null 
                 ? uiWidgetWindowAdapter.windowPosToScreenPos(imeGlobalPos) 
                 : _editorWindowPosToScreenPos(imeGlobalPos);
         }
 
         void _handleMethodCall(string method, List<JSONNode> args) {
-            if (TextInput._currentConnection == null) {
+            D.assert(false, () => "keyboard.handleMethodCall is not implemented yet!");
+            
+            /*if (TextInput._currentConnection == null) {
                 return;
             }
             int client = args[0].AsInt;
                     default:
                         throw new UIWidgetsError($"unknown method ${method}");
                 }
-            }
+            }*/
         } 
     }
     

com.unity.uiwidgets/Runtime/service/text_formatter.cs

 using System;
 using System.Text.RegularExpressions;
 using Unity.UIWidgets.foundation;
+using Unity.UIWidgets.ui;
 using UnityEngine;
 
 namespace Unity.UIWidgets.service {

com.unity.uiwidgets/Runtime/ui2/window.cs

             }
         }
 
+        public Offset windowPosToScreenPos(Offset offset) {
+            D.assert(false, () => "window.windowPosToScreenPos is not implemented yet!");
+            return offset;
+        }
+
+        public void run(Action callback) {
+            //Fixme: do nothing now
+            D.assert(false, () => "window.run is not implemented yet!");
+        }
+
         public PointerDataPacketCallback onPointerDataPacket {
             get { return _onPointerDataPacket; }
             set {