Commit 6506cc31 authored by varga%utcru.sk's avatar varga%utcru.sk
Browse files

Fix for 97062. 

Implement a content model view for <outliner>.
r=bryner sr=hyatt
parent e8ba05ad

content/shared/public/nsXULAtomList.h

+3 −0
Original line number Diff line number Diff line
@@ -98,7 +98,10 @@ XUL_ATOM(focus, "focus") 
XUL_ATOM(outliner, "outliner")

XUL_ATOM(outlinerbody, "outlinerbody")

XUL_ATOM(outlinercol, "outlinercol")

XUL_ATOM(outlinerchildren, "outlinerchildren")

XUL_ATOM(outlineritem, "outlineritem")

XUL_ATOM(outlinerrow, "outlinerrow")

XUL_ATOM(outlinerseparator, "outlinerseparator")

XUL_ATOM(outlinercell, "outlinercell")



XUL_ATOM(cycler, "cycler")

layout/base/nsCSSFrameConstructor.cpp

+24 −0
Original line number Diff line number Diff line
@@ -7790,6 +7790,14 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext, 
    PRInt32 namespaceID;

    bindingManager->ResolveTag(aContainer, &namespaceID, getter_AddRefs(tag));









    // Just ignore outliner tags, anyway we don't create any frames for them.









    if (tag == nsXULAtoms::outlineritem ||









        tag == nsXULAtoms::outlinerseparator ||









        tag == nsXULAtoms::outlinerchildren ||









        tag == nsXULAtoms::outlinerrow ||









        tag == nsXULAtoms::outlinercell)









      return NS_OK;

















    PRBool treeChildren = tag.get() == nsXULAtoms::treechildren;









    PRBool treeItem = tag.get() == nsXULAtoms::treeitem;
















@@ -8370,6 +8378,14 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,







    PRInt32 namespaceID;









    bindingManager->ResolveTag(aContainer, &namespaceID, getter_AddRefs(tag));

















    // Just ignore outliner tags, anyway we don't create any frames for them.









    if (tag == nsXULAtoms::outlineritem ||









        tag == nsXULAtoms::outlinerseparator ||









        tag == nsXULAtoms::outlinerchildren ||









        tag == nsXULAtoms::outlinerrow ||









        tag == nsXULAtoms::outlinercell)









      return NS_OK;

















    PRBool treeChildren = tag && tag.get() == nsXULAtoms::treechildren;









    PRBool treeItem = tag && tag.get() == nsXULAtoms::treeitem;









    if (treeChildren || treeItem) {








@@ -9228,6 +9244,14 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,







    PRInt32 namespaceID;









    bindingManager->ResolveTag(aContainer, &namespaceID, getter_AddRefs(tag));

















    // Just ignore outliner tags, anyway we don't create any frames for them.









    if (tag == nsXULAtoms::outlineritem ||









        tag == nsXULAtoms::outlinerseparator ||









        tag == nsXULAtoms::outlinerchildren ||









        tag == nsXULAtoms::outlinerrow ||









        tag == nsXULAtoms::outlinercell)









      return NS_OK;

















    PRBool treeChildren = tag && tag.get() == nsXULAtoms::treechildren;









    PRBool treeItem = tag && tag.get() == nsXULAtoms::treeitem;








































layout/html/style/src/nsCSSFrameConstructor.cpp



+24
−0






























Original line number
Diff line number
Diff line







@@ -7790,6 +7790,14 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,







    PRInt32 namespaceID;









    bindingManager->ResolveTag(aContainer, &namespaceID, getter_AddRefs(tag));

















    // Just ignore outliner tags, anyway we don't create any frames for them.









    if (tag == nsXULAtoms::outlineritem ||









        tag == nsXULAtoms::outlinerseparator ||









        tag == nsXULAtoms::outlinerchildren ||









        tag == nsXULAtoms::outlinerrow ||









        tag == nsXULAtoms::outlinercell)









      return NS_OK;

















    PRBool treeChildren = tag.get() == nsXULAtoms::treechildren;









    PRBool treeItem = tag.get() == nsXULAtoms::treeitem;
















@@ -8370,6 +8378,14 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,







    PRInt32 namespaceID;









    bindingManager->ResolveTag(aContainer, &namespaceID, getter_AddRefs(tag));

















    // Just ignore outliner tags, anyway we don't create any frames for them.









    if (tag == nsXULAtoms::outlineritem ||









        tag == nsXULAtoms::outlinerseparator ||









        tag == nsXULAtoms::outlinerchildren ||









        tag == nsXULAtoms::outlinerrow ||









        tag == nsXULAtoms::outlinercell)









      return NS_OK;

















    PRBool treeChildren = tag && tag.get() == nsXULAtoms::treechildren;









    PRBool treeItem = tag && tag.get() == nsXULAtoms::treeitem;









    if (treeChildren || treeItem) {








@@ -9228,6 +9244,14 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,







    PRInt32 namespaceID;









    bindingManager->ResolveTag(aContainer, &namespaceID, getter_AddRefs(tag));

















    // Just ignore outliner tags, anyway we don't create any frames for them.









    if (tag == nsXULAtoms::outlineritem ||









        tag == nsXULAtoms::outlinerseparator ||









        tag == nsXULAtoms::outlinerchildren ||









        tag == nsXULAtoms::outlinerrow ||









        tag == nsXULAtoms::outlinercell)









      return NS_OK;

















    PRBool treeChildren = tag && tag.get() == nsXULAtoms::treechildren;









    PRBool treeItem = tag && tag.get() == nsXULAtoms::treeitem;








































layout/xul/base/src/outliner/public/Makefile.in



+1
−0






























Original line number
Diff line number
Diff line







@@ -33,6 +33,7 @@ XPIDLSRCS=      nsIOutlinerView.idl               \







				nsIOutlinerSelection.idl    \









                nsIOutlinerBoxObject.idl \









				nsIOutlinerColFrame.idl \









                nsIOutlinerContentView.idl \









                $(NULL)



















EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
































layout/xul/base/src/outliner/public/makefile.win



+1
−0






























Original line number
Diff line number
Diff line







@@ -25,6 +25,7 @@ XPIDLSRCS=      .\nsIOutlinerView.idl    \







                .\nsIOutlinerSelection.idl               \









                .\nsIOutlinerBoxObject.idl \









				.\nsIOutlinerColFrame.idl \









                .\nsIOutlinerContentView.idl \









                $(NULL)



















MODULE=layout_xul