don't apply xul display types to tags that would normally cause tag based frame creation, bug 322185, r/sr = bzbarsky

layout/base/nsCSSFrameConstructor.cpp

@@ -6044,7 +6044,12 @@ nsCSSFrameConstructor::ConstructXULFrame(nsFrameConstructorState& aState,
   
   PRBool isXULNS = (aNameSpaceID == kNameSpaceID_XUL);
   PRBool isXULDisplay = IsXULDisplayType(display);
-  
+
+   // don't apply xul display types to tag based frames
+  if (isXULDisplay && !isXULNS) {
+    isXULDisplay = !IsSpecialContent(aContent, aTag, aNameSpaceID, aStyleContext);
+  }
+
   PRBool triedFrame = PR_FALSE;
 
   if (isXULNS || isXULDisplay) {