another fix
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b15d2c09 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b15d2c09 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b15d2c09 Branch: refs/heads/spark Commit: b15d2c09ff785da8efd3c08100a456a5caf8c19c Parents: 0d54689 Author: Alex Harui <aha...@apache.org> Authored: Wed Sep 7 14:34:34 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Wed Sep 7 14:34:34 2016 -0700 ---------------------------------------------------------------------- .../mx/managers/systemClasses/ChildManager.as | 137 +++++++++---------- 1 file changed, 68 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b15d2c09/frameworks/projects/MX/src/main/flex/mx/managers/systemClasses/ChildManager.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MX/src/main/flex/mx/managers/systemClasses/ChildManager.as b/frameworks/projects/MX/src/main/flex/mx/managers/systemClasses/ChildManager.as index 0b2203e..8acf3a2 100644 --- a/frameworks/projects/MX/src/main/flex/mx/managers/systemClasses/ChildManager.as +++ b/frameworks/projects/MX/src/main/flex/mx/managers/systemClasses/ChildManager.as @@ -336,76 +336,75 @@ public class ChildManager implements ISystemManagerChildManager { // Create a new instance of the toplevel class systemManager.document = app = topLevelWindow = IUIComponent(systemManager.create()); - COMPILE::SWF - { - FlashEventConverter.setupAllConverters(app as DisplayObject); - } - - CONFIG::performanceInstrumentation - { - perfUtil.markTime("SystemManager.create().end"); - } - - if (systemManager.document) - { - // Add listener for the creationComplete event - IEventDispatcher(app).addEventListener(FlexEvent.CREATION_COMPLETE, - appCreationCompleteHandler); - - COMPILE::LATER - { - // if somebody has set this in our applicationdomain hierarchy, don't overwrite it - if (!LoaderConfig._url) - { - LoaderConfig._url = LoaderUtil.normalizeURL(systemManager.loaderInfo); - LoaderConfig._parameters = systemManager.loaderInfo.parameters; - LoaderConfig._swfVersion = systemManager.loaderInfo.swfVersion; - } - } - - IFlexDisplayObject(app).setActualSize(width, height); - - // Wait for the app to finish its initialization sequence - // before doing an addChild(). - // Otherwise, the measurement/layout code will cause the - // player to do a bunch of unnecessary screen repaints, - // which slows application startup time. - - // Pass the application instance to the preloader. - // Note: preloader can be null when the user chooses - // Control > Play in the standalone player. - if (preloader) - preloader.registerApplication(app); - - // The Application doesn't get added to the SystemManager in the standard way. - // We want to recursively create the entire application subtree and process - // it with the LayoutManager before putting the Application on the display list. - // So here we what would normally happen inside an override of addChild(). - // Leter, when we actually attach the Application instance, - // we call super.addChild(), which is the bare player method. - addingChild(DisplayObject(app)); - - CONFIG::performanceInstrumentation - { - perfUtil.markTime("Application.createChildren().start"); - } - - childAdded(DisplayObject(app)); // calls app.createChildren() + } + else + app = topLevelWindow = systemManager.document as IUIComponent; + + COMPILE::SWF + { + FlashEventConverter.setupAllConverters(app as DisplayObject); + } + + CONFIG::performanceInstrumentation + { + perfUtil.markTime("SystemManager.create().end"); + } + + if (systemManager.document) + { + // Add listener for the creationComplete event + IEventDispatcher(app).addEventListener(FlexEvent.CREATION_COMPLETE, + appCreationCompleteHandler); + } + + COMPILE::LATER + { + // if somebody has set this in our applicationdomain hierarchy, don't overwrite it + if (!LoaderConfig._url) + { + LoaderConfig._url = LoaderUtil.normalizeURL(systemManager.loaderInfo); + LoaderConfig._parameters = systemManager.loaderInfo.parameters; + LoaderConfig._swfVersion = systemManager.loaderInfo.swfVersion; + } + } + + IFlexDisplayObject(app).setActualSize(width, height); + + // Wait for the app to finish its initialization sequence + // before doing an addChild(). + // Otherwise, the measurement/layout code will cause the + // player to do a bunch of unnecessary screen repaints, + // which slows application startup time. + + // Pass the application instance to the preloader. + // Note: preloader can be null when the user chooses + // Control > Play in the standalone player. + if (preloader) + preloader.registerApplication(app); + + // The Application doesn't get added to the SystemManager in the standard way. + // We want to recursively create the entire application subtree and process + // it with the LayoutManager before putting the Application on the display list. + // So here we what would normally happen inside an override of addChild(). + // Leter, when we actually attach the Application instance, + // we call super.addChild(), which is the bare player method. + addingChild(DisplayObject(app)); + + CONFIG::performanceInstrumentation + { + perfUtil.markTime("Application.createChildren().start"); + } + + childAdded(DisplayObject(app)); // calls app.createChildren() + + CONFIG::performanceInstrumentation + { + perfUtil.markTime("Application.createChildren().end"); + } - CONFIG::performanceInstrumentation - { - perfUtil.markTime("Application.createChildren().end"); - } - } - else - { - systemManager.document = this; - } - - CONFIG::performanceInstrumentation - { - perfUtil.markTime("ChildManager.initializeTopLevelWindow().end"); - } + CONFIG::performanceInstrumentation + { + perfUtil.markTime("ChildManager.initializeTopLevelWindow().end"); } }
