Moving nsRuleNode.cpp back to content/base/src from content/shared/src and inlining GetRule to fix linker errors on BeOS and probably also AIX, and since it doesn't need to be in content/shared and cvs won't like re-adding to content/html/style/src. b=104336

content/base/src/Makefile.in

@@ -76,6 +76,7 @@ CPPSRCS		= \
 		nsNodeInfo.cpp \
 		nsNodeInfoManager.cpp \
 		nsRange.cpp \
+		nsRuleNode.cpp \
 		nsSelection.cpp \
 		nsStyleContext.cpp \
 		nsStyleSet.cpp \

content/base/src/makefile.win

@@ -51,12 +51,13 @@ CPPSRCS =				\
 	nsTextFragment.cpp		\
 	nsSelection.cpp			\
 	nsRange.cpp			\
+	nsRuleNode.cpp			\
 	nsTextContentChangeData.cpp	\
 	nsTextNode.cpp			\
 	nsTreeWalker.cpp		\
 	nsXMLContentSerializer.cpp	\
 	nsHTMLContentSerializer.cpp	\
-    nsParserUtils.cpp               \
+	nsParserUtils.cpp		\
 	nsPlainTextSerializer.cpp	\
 	nsContentUtils.cpp 		\
 	nsScriptLoader.cpp		\
@@ -116,6 +117,7 @@ CPP_OBJS=					\
 	.\$(OBJDIR)\nsNodeInfoManager.obj	\
 	.\$(OBJDIR)\nsSelection.obj		\
 	.\$(OBJDIR)\nsRange.obj			\
+	.\$(OBJDIR)\nsRuleNode.obj		\
 	.\$(OBJDIR)\nsTextContentChangeData.obj	\
 	.\$(OBJDIR)\nsTextNode.obj		\
 	.\$(OBJDIR)\nsTreeWalker.obj		\

content/html/style/src/Makefile.in

@@ -59,13 +59,13 @@ CPPSRCS		= \
 		nsCSSRules.cpp \
 		nsCSSStyleSheet.cpp \
 		nsCSSValue.cpp \
+		nsComputedDOMStyle.cpp \
 		nsDOMCSSDeclaration.cpp \
 		nsHTMLAttributes.cpp \
 		nsHTMLStyleSheet.cpp \
 		nsHTMLCSSStyleSheet.cpp \
-		nsComputedDOMStyle.cpp \
 		nsROCSSPrimitiveValue.cpp \
-    $(NULL)
+		$(NULL)
 
 EXPORTS		= \
 		nsDOMCSSDeclaration.h \

content/shared/public/nsRuleNode.h

@@ -507,7 +507,13 @@ public:
   nsresult Transition(nsIStyleRule* aRule, nsRuleNode** aResult);
   nsRuleNode* GetParent() { return mParent; }
   PRBool IsRoot() { return mParent == nsnull; }
-  nsresult GetRule(nsIStyleRule** aResult);
+  nsresult GetRule(nsIStyleRule** aResult)
+  {
+    *aResult = mRule;
+    NS_IF_ADDREF(*aResult);
+    return NS_OK;
+  }
+
   nsresult ClearCachedData(nsIStyleRule* aRule);
   nsresult ClearCachedDataInSubtree(nsIStyleRule* aRule);
   nsresult GetPresContext(nsIPresContext** aResult);

content/shared/src/Makefile.in

@@ -36,7 +36,7 @@ REQUIRES	= xpcom \
 		  locale \
 		  dom \
 		  webshell \
-      docshell \
+		  docshell \
 		  pref \
 		  necko \
 		  htmlparser \
@@ -49,16 +49,15 @@ CPPSRCS		= \
 		nsCSSKeywords.cpp \
 		nsCSSProps.cpp \
 		nsHTMLAtoms.cpp \
-    nsHTMLUtils.cpp   \
+		nsHTMLUtils.cpp   \
 		nsHTMLValue.cpp \
 		nsImageMapUtils.cpp \
 		nsLayoutAtoms.cpp \
-    nsRuleNode.cpp \
 		nsStyleUtil.cpp \
 		nsTextFragment.cpp \
 		nsXULAtoms.cpp \
 		nsStyleCoord.cpp \
-    nsStyleStruct.cpp \
+		nsStyleStruct.cpp \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.

content/shared/src/makefile.win

@@ -28,7 +28,7 @@ REQUIRES	= xpcom \
 		  locale \
 		  dom \
 		  webshell \
-      docshell \
+		  docshell \
 		  pref \
 		  necko \
 		  htmlparser \
@@ -44,7 +44,7 @@ DEFINES=-D_IMPL_NS_LAYOUT -DWIN32_LEAN_AND_MEAN
 DEFINES = $(DEFINES) -DXP_NEW_SELECTION
 !endif
 
-CPPSRCS =				\
+CPPSRCS = \
   nsCSSAtoms.cpp \
   nsCSSKeywords.cpp \
   nsCSSProps.cpp \
@@ -53,16 +53,15 @@ CPPSRCS =				\
   nsHTMLValue.cpp \
   nsImageMapUtils.cpp \
   nsLayoutAtoms.cpp \
-  nsRuleNode.cpp \
   nsStyleUtil.cpp \
   nsStyleStruct.cpp \
   nsTextFragment.cpp \
   nsXULAtoms.cpp \
   nsStyleCoord.cpp \
-	$(NULL)
+  $(NULL)
 
 
-CPP_OBJS=					\
+CPP_OBJS= \
   .\$(OBJDIR)\nsCSSAtoms.obj \
   .\$(OBJDIR)\nsCSSKeywords.obj \
   .\$(OBJDIR)\nsCSSProps.obj \
@@ -71,13 +70,12 @@ CPP_OBJS=					\
   .\$(OBJDIR)\nsHTMLValue.obj \
   .\$(OBJDIR)\nsImageMapUtils.obj \
   .\$(OBJDIR)\nsLayoutAtoms.obj \
-  .\$(OBJDIR)\nsRuleNode.obj \
   .\$(OBJDIR)\nsStyleUtil.obj \
   .\$(OBJDIR)\nsStyleStruct.obj \
   .\$(OBJDIR)\nsTextFragment.obj \
   .\$(OBJDIR)\nsXULAtoms.obj \
   .\$(OBJDIR)\nsStyleCoord.obj \
-	$(NULL)
+  $(NULL)
 
 LCFLAGS = \
         $(LCFLAGS) \

content/shared/src/nsRuleNode.cpp

@@ -489,14 +489,6 @@ nsRuleNode::Transition(nsIStyleRule* aRule, nsRuleNode** aResult)
   return NS_OK;
 }
 
-nsresult
-nsRuleNode::GetRule(nsIStyleRule** aResult)
-{
-  *aResult = mRule;
-  NS_IF_ADDREF(*aResult);
-  return NS_OK;
-}
-
 nsresult
 nsRuleNode::PathContainsRule(nsIStyleRule* aRule, PRBool* aMatched)
 {

layout/style/nsRuleNode.h

@@ -507,7 +507,13 @@ public:
   nsresult Transition(nsIStyleRule* aRule, nsRuleNode** aResult);
   nsRuleNode* GetParent() { return mParent; }
   PRBool IsRoot() { return mParent == nsnull; }
-  nsresult GetRule(nsIStyleRule** aResult);
+  nsresult GetRule(nsIStyleRule** aResult)
+  {
+    *aResult = mRule;
+    NS_IF_ADDREF(*aResult);
+    return NS_OK;
+  }
+
   nsresult ClearCachedData(nsIStyleRule* aRule);
   nsresult ClearCachedDataInSubtree(nsIStyleRule* aRule);
   nsresult GetPresContext(nsIPresContext** aResult);