Merge branch 'siyaoH/skiaBase' of https://github.com/Unity-Technologies/com.unity.uiwidgets into zxw/skiaBase

# Conflicts: # Samples/UIWidgetsSamples_2019_4/Assets/TextTest.unity
4 年前 · 4c9f4b75
--- a/Samples/UIWidgetsSamples_2019_4/Assets/TextTest.unity
+++ b/Samples/UIWidgetsSamples_2019_4/Assets/TextTest.unity
  m_Component:
  - component: {fileID: 847097469}
  - component: {fileID: 847097471}
-  - component: {fileID: 847097470}
+  - component: {fileID: 847097472}
  m_Layer: 5
  m_Name: RawImage
  m_TagString: Untagged
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -1.3, y: 0.8}
--- !u!114 &847097470
+--- !u!222 &847097471
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 847097468}
+  m_CullTransparentMesh: 0
+--- !u!114 &847097472
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  fonts: []
  devicePixelRatioOverride: 0
  hardwareAntiAliasing: 0
--- !u!222 &847097471
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 847097468}
-  m_CullTransparentMesh: 0
--- !u!1 &1140493537
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1140493542}
-  - component: {fileID: 1140493541}
-  - component: {fileID: 1140493540}
-  - component: {fileID: 1140493539}
-  - component: {fileID: 1140493538}
-  m_Layer: 0
-  m_Name: Plane
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!114 &1140493538
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1140493537}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ff655c85f67513d4d9e0967df8685a48, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- !u!64 &1140493539
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1140493537}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1140493540
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1140493537}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
--- !u!33 &1140493541
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1140493537}
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1140493542
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1140493537}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1548023132
 GameObject:
  m_ObjectHideFlags: 0
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2122288186
 GameObject:
  m_Children:
  - {fileID: 847097469}
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
--- a/com.unity.uiwidgets/Runtime/engine2/UIWidgetsPanel.cs
+++ b/com.unity.uiwidgets/Runtime/engine2/UIWidgetsPanel.cs
        }

        protected override void OnRectTransformDimensionsChange() {
-            if (_ptr != IntPtr.Zero) {
+            if (_ptr != IntPtr.Zero  && _renderTexture) {
                if (_recreateRenderTexture(_currentWidth, _currentHeight, _currentDevicePixelRatio)) {
                    UIWidgetsPanel_onRenderTexture(_ptr,
                        _renderTexture.GetNativeTexturePtr(),
--- a/com.unity.uiwidgets/Runtime/painting/inline_span.cs
+++ b/com.unity.uiwidgets/Runtime/painting/inline_span.cs
        public override int GetHashCode() {
            return (style != null ? style.GetHashCode() : 0);
        }
+        
+        public static bool operator ==(InlineSpan left, InlineSpan right) {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(InlineSpan left, InlineSpan right) {
+            return !Equals(left, right);
+        }
    }
 }
--- a/com.unity.uiwidgets/Runtime/painting/text_painter.cs
+++ b/com.unity.uiwidgets/Runtime/painting/text_painter.cs
            get { return _text; }
            set {
                D.assert(value == null || value.debugAssertIsValid());
-                if ((_text == null && value == null) || (_text != null && text.Equals(value))) {
+                if (_text == value) {
                    return;
                }

--- a/engine/src/shell/platform/unity/win32_task_runner.cc
+++ b/engine/src/shell/platform/unity/win32_task_runner.cc
  for (const auto& observer : task_observers_) {
    observer.second();
  }
-	
+
  // Fire expired tasks.
  {
    // Flushing tasks here without holing onto the task queue mutex.

 Win32TaskRunner::TaskTimePoint Win32TaskRunner::TimePointFromUIWidgetsTime(
    uint64_t uiwidgets_target_time_nanos) {
+  const auto fml_now = fml::TimePoint::Now().ToEpochDelta().ToNanoseconds();
+  if (uiwidgets_target_time_nanos <= fml_now) {
+    return {};
+  }
+  const auto uiwidgets_duration = uiwidgets_target_time_nanos - fml_now;
-  const auto uiwidgets_duration =
-      uiwidgets_target_time_nanos -
-      fml::TimePoint::Now().ToEpochDelta().ToNanoseconds();
  return now + std::chrono::nanoseconds(uiwidgets_duration);
 }