merge commit 80099e1

microsoft · Sep 24, 2016 · c7f6955 · c7f6955
1 parent 1473d95
commit c7f6955
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 23 deletions.
diff --git a/Frameworks/QuartzCore/CALayer.mm b/Frameworks/QuartzCore/CALayer.mm
@@ -2424,23 +2424,28 @@ - (void)_displayChanged {
             ^{
                 // If we have a valid non-dealloc'd object, run its display update pass
                 if (strongSuperLayer) {
-                    strongSuperLayer->priv->_displayPending = false;
-
-                    if (DEBUG_VERBOSE) {
-                        TraceVerbose(
-                            TAG,
-                            L"Performing _displayChanged work for superlayer (%hs - 0x%p, %hs - 0x%p).",
-                            object_getClassName(strongSuperLayer),
-                            strongSuperLayer,
-                            strongSuperLayer->priv->delegate ? object_getClassName(strongSuperLayer->priv->delegate) : "nil",
-                            strongSuperLayer->priv->delegate);
+                    // Only run the update pass for this superLayer if it's a 'root layer' - aka a UIWindow layer,
+                    // or if we're running as a framework - aka for middleware scenarios - where the layer won't have
+                    // a 'root' superlayer.
+                    if (strongSuperLayer->priv->isRootLayer || GetCACompositor()->IsRunningAsFramework()) {
+                        strongSuperLayer->priv->_displayPending = false;
+
+                        if (DEBUG_VERBOSE) {
+                            TraceVerbose(
+                                TAG,
+                                L"Performing _displayChanged work for superlayer (%hs - 0x%p, %hs - 0x%p).",
+                                object_getClassName(strongSuperLayer),
+                                strongSuperLayer,
+                                strongSuperLayer->priv->delegate ? object_getClassName(strongSuperLayer->priv->delegate) : "nil",
+                                strongSuperLayer->priv->delegate);
+                        }
+
+                        // Recalculate layouts
+                        DoLayerLayouts(strongSuperLayer, true);
+
+                        // Redisplay anything necessary
+                        DoDisplayList(strongSuperLayer);
                     }
-
-                    // Recalculate layouts
-                    DoLayerLayouts(strongSuperLayer, true);
-
-                    // Redisplay anything necessary
-                    DoDisplayList(strongSuperLayer);
                 } else if (DEBUG_VERBOSE) {
                     TraceVerbose(TAG, L"Skipping _displayChanged work for currently-dealloc'd object (0x%p).", rawSuperLayerForLog);
                 }

diff --git a/Frameworks/UIKit/StarboardXaml/CompositorInterface.h b/Frameworks/UIKit/StarboardXaml/CompositorInterface.h
@@ -25,6 +25,13 @@ class DisplayNode;
 class DisplayTexture;
 class DisplayAnimation;
 
+typedef enum {
+    CompositionModeDefault = 0,
+    CompositionModeLibrary = 1,
+} CompositionMode;
+
+void CreateXamlCompositor(winobjc::Id& root, CompositionMode compositionMode);
+
 template <class T>
 class RefCounted;
 

diff --git a/Frameworks/UIKit/StarboardXaml/CompositorInterface.mm b/Frameworks/UIKit/StarboardXaml/CompositorInterface.mm
@@ -55,6 +55,7 @@
 
 @class RTObject;
 
+CompositionMode g_compositionMode = CompositionModeDefault;
 bool dxLandscape = false;
 
 float screenWidth = 320.0f;
@@ -1609,9 +1610,14 @@ void DisableDisplaySyncNotification() override {
     virtual void SetShouldRasterize(DisplayNode* node, bool rasterize) override {
         node->SetShouldRasterize(rasterize);
     }
+
+    virtual bool IsRunningAsFramework() override {
+        return g_compositionMode == CompositionModeLibrary;
+    }
 };
 
-void CreateXamlCompositor(winobjc::Id& root) {
+void CreateXamlCompositor(winobjc::Id& root, CompositionMode compositionMode) {
+    g_compositionMode = compositionMode;
     CGImageAddDestructionListener(UIReleaseDisplayTextureForCGImage);
     static CAXamlCompositor* compIntr = new CAXamlCompositor();
     SetCACompositor(compIntr);

diff --git a/Frameworks/UIKit/StarboardXaml/StarboardXaml.cpp b/Frameworks/UIKit/StarboardXaml/StarboardXaml.cpp
@@ -267,7 +267,7 @@ void _ApplicationLaunch(ActivationType activationType, Platform::Object^ activat
     auto rootFrame = ref new Xaml::Controls::Frame();
     rootFrame->Content = uiElem;
 
-    SetXamlRoot(uiElem);
+    SetXamlRoot(uiElem, activationType);
 
     if (activationType != ActivationTypeLibrary) {
         Xaml::Window::Current->Content = rootFrame;

diff --git a/Frameworks/UIKit/StarboardXaml/XamlCompositor.cpp b/Frameworks/UIKit/StarboardXaml/XamlCompositor.cpp
@@ -624,11 +624,9 @@ void SetScreenParameters(float width, float height, float magnification, float r
     XamlCompositor::Controls::CALayerXaml::ApplyMagnificationFactor(windowCollection, magnification, rotation);
 }
 
-void CreateXamlCompositor(winobjc::Id& root);
-
-extern "C" void SetXamlRoot(Windows::UI::Xaml::Controls::Grid^ grid) {
+extern "C" void SetXamlRoot(Windows::UI::Xaml::Controls::Grid^ grid, ActivationType activationType) {
     winobjc::Id gridObj((Platform::Object^)grid);
-    CreateXamlCompositor(gridObj);
+    CreateXamlCompositor(gridObj, ((activationType == ActivationTypeLibrary) ? CompositionModeLibrary : CompositionModeDefault));
 }
 
 void DispatchCompositorTransactions(

diff --git a/Frameworks/UIKit/StarboardXaml/XamlCompositor.h b/Frameworks/UIKit/StarboardXaml/XamlCompositor.h
@@ -15,4 +15,4 @@
 //******************************************************************************
 #pragma once
 
-extern "C" void SetXamlRoot(Windows::UI::Xaml::Controls::Grid ^ grid);
+extern "C" void SetXamlRoot(Windows::UI::Xaml::Controls::Grid ^ grid, ActivationType activationType);
diff --git a/Frameworks/include/CACompositor.h b/Frameworks/include/CACompositor.h
@@ -133,6 +133,8 @@ class CACompositorInterface {
     virtual void DisableDisplaySyncNotification() = 0;
 
     virtual void SetShouldRasterize(DisplayNode* node, bool rasterize) = 0;
+
+    virtual bool IsRunningAsFramework() = 0;
 };
 
 extern CACompositorInterface* _globalCompositor;

diff --git a/tests/unittests/UIKit/NullCompositor.h b/tests/unittests/UIKit/NullCompositor.h
@@ -185,4 +185,8 @@ class NullCompositor : public CACompositorInterface {
 
     virtual void SetShouldRasterize(DisplayNode* node, bool rasterize) override {
     }
+
+    virtual bool IsRunningAsFramework() override {
+        return false;
+    }
 };