You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/12/29 00:00:17 UTC
git commit: [flex-sdk] [refs/heads/develop] - FLEX-33891 stop
getstyleManager being called twice
Updated Branches:
refs/heads/develop 6bd6b9748 -> cbf36b583
FLEX-33891 stop getstyleManager being called twice
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/cbf36b58
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cbf36b58
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cbf36b58
Branch: refs/heads/develop
Commit: cbf36b5832c2561aaeca66d6736e2d69ffcf0981
Parents: 6bd6b97
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Dec 29 09:50:54 2013 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Sun Dec 29 09:50:54 2013 +1100
----------------------------------------------------------------------
.../projects/framework/src/mx/styles/StyleProtoChain.as | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/cbf36b58/frameworks/projects/framework/src/mx/styles/StyleProtoChain.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/framework/src/mx/styles/StyleProtoChain.as b/frameworks/projects/framework/src/mx/styles/StyleProtoChain.as
index fd88566..92a70f9 100644
--- a/frameworks/projects/framework/src/mx/styles/StyleProtoChain.as
+++ b/frameworks/projects/framework/src/mx/styles/StyleProtoChain.as
@@ -95,7 +95,7 @@ public class StyleProtoChain
var className:String = qualified ? getQualifiedClassName(object) : object.className;
var advancedObject:IAdvancedStyleClient = object as IAdvancedStyleClient;
- var typeHierarchy:OrderedObject = getTypeHierarchy(object, qualified);
+ var typeHierarchy:OrderedObject = getTypeHierarchy(object, styleManager, qualified);
var types:Array = typeHierarchy.propertyList;
var typeCount:int = types.length;
var classDecls:Array = null;
@@ -788,7 +788,7 @@ public class StyleProtoChain
{
var styleManager:IStyleManager2 = getStyleManager(object);
var qualified:Boolean = styleManager.qualifiedTypeSelectors;
- var typeHierarchy:OrderedObject = getTypeHierarchy(object, qualified);
+ var typeHierarchy:OrderedObject = getTypeHierarchy(object, styleManager, qualified);
return typeHierarchy.object_proxy::getObjectProperty(cssType) != null;
}
@@ -841,9 +841,8 @@ public class StyleProtoChain
* name and then each super class name until we hit a stop class, such as
* mx.core::UIComponent.
*/
- private static function getTypeHierarchy(object:IStyleClient, qualified:Boolean=true):OrderedObject
+ private static function getTypeHierarchy(object:IStyleClient, styleManager:IStyleManager2, qualified:Boolean=true):OrderedObject
{
- var styleManager:IStyleManager2 = getStyleManager(object);
var className:String = getQualifiedClassName(object);
var hierarchy:OrderedObject = styleManager.typeHierarchyCache[className] as OrderedObject;
if (hierarchy == null)