Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 04:58:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 122512 - make sure we don't construct inline frames for children of a select (size > 1) widget when using xbl form controls. r=hewitt,sr=hyatt.

Browse Source
This commit is contained in:
bryner%netscape.com 2002-01-30 01:38:55 +00:00
parent 1ac5e5126f
commit ad77812ae5
2 changed files with 92 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
layout/base/nsCSSFrameConstructor.cpp
View File

@ -107,6 +107,7 @@
#include "nsIDOMMutationEvent.h"
#include "nsChildIterator.h"
#include "nsCSSRendering.h"
#include "nsISelectElement.h"
static NS_DEFINE_CID(kTextNodeCID, NS_TEXTNODE_CID);
static NS_DEFINE_CID(kHTMLElementFactoryCID, NS_HTML_ELEMENT_FACTORY_CID);
@ -7788,10 +7789,23 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,
// Just ignore outliner tags, anyway we don't create any frames for them.
if (tag == nsXULAtoms::outlinerchildren ||
tag == nsXULAtoms::outlineritem ||
tag == nsXULAtoms::outlinerrow ||
(UseXBLForms() && tag == nsHTMLAtoms::select))
tag == nsXULAtoms::outlinerrow)
return NS_OK;
// Ignore option elements inside a select (size > 1), if we are using XBL forms
if (UseXBLForms()) {
nsCOMPtr<nsISelectElement> selectElement = do_QueryInterface(aContainer);
if (selectElement) {
nsAutoString selSize;
aContainer->GetAttr(kNameSpaceID_None, nsHTMLAtoms::size, selSize);
if (!selSize.IsEmpty()) {
PRInt32 err;
if (selSize.ToInteger(&err) > 1)
return NS_OK;
}
}
}
PRBool treeChildren = tag.get() == nsXULAtoms::treechildren;
PRBool treeItem = tag.get() == nsXULAtoms::treeitem;
@ -8398,10 +8412,23 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,
// Just ignore outliner tags, anyway we don't create any frames for them.
if (tag == nsXULAtoms::outlinerchildren ||
tag == nsXULAtoms::outlineritem ||
tag == nsXULAtoms::outlinerrow ||
(UseXBLForms() && tag == nsHTMLAtoms::select))
tag == nsXULAtoms::outlinerrow)
return NS_OK;
// Ignore option elements inside a select (size > 1), if we are using XBL forms
if (UseXBLForms()) {
nsCOMPtr<nsISelectElement> selectElement = do_QueryInterface(aContainer);
if (selectElement) {
nsAutoString selSize;
aContainer->GetAttr(kNameSpaceID_None, nsHTMLAtoms::size, selSize);
if (!selSize.IsEmpty()) {
PRInt32 err;
if (selSize.ToInteger(&err) > 1)
return NS_OK;
}
}
}
PRBool treeChildren = tag && tag.get() == nsXULAtoms::treechildren;
PRBool treeItem = tag && tag.get() == nsXULAtoms::treeitem;
if (treeChildren || treeItem) {
@ -9300,10 +9327,23 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
// Just ignore outliner tags, anyway we don't create any frames for them.
if (tag == nsXULAtoms::outlinerchildren ||
tag == nsXULAtoms::outlineritem ||
tag == nsXULAtoms::outlinerrow ||
(UseXBLForms() && tag == nsHTMLAtoms::select))
tag == nsXULAtoms::outlinerrow)
return NS_OK;
// Ignore option elements inside a select (size > 1), if we are using XBL forms
if (UseXBLForms()) {
nsCOMPtr<nsISelectElement> selectElement = do_QueryInterface(aContainer);
if (selectElement) {
nsAutoString selSize;
aContainer->GetAttr(kNameSpaceID_None, nsHTMLAtoms::size, selSize);
if (!selSize.IsEmpty()) {
PRInt32 err;
if (selSize.ToInteger(&err) > 1)
return NS_OK;
}
}
}
PRBool treeChildren = tag && tag.get() == nsXULAtoms::treechildren;
PRBool treeItem = tag && tag.get() == nsXULAtoms::treeitem;
if (treeChildren || treeItem) {

52
layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -107,6 +107,7 @@
#include "nsIDOMMutationEvent.h"
#include "nsChildIterator.h"
#include "nsCSSRendering.h"
#include "nsISelectElement.h"
static NS_DEFINE_CID(kTextNodeCID, NS_TEXTNODE_CID);
static NS_DEFINE_CID(kHTMLElementFactoryCID, NS_HTML_ELEMENT_FACTORY_CID);
@ -7788,10 +7789,23 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,
// Just ignore outliner tags, anyway we don't create any frames for them.
if (tag == nsXULAtoms::outlinerchildren ||
tag == nsXULAtoms::outlineritem ||
tag == nsXULAtoms::outlinerrow ||
(UseXBLForms() && tag == nsHTMLAtoms::select))
tag == nsXULAtoms::outlinerrow)
return NS_OK;
// Ignore option elements inside a select (size > 1), if we are using XBL forms
if (UseXBLForms()) {
nsCOMPtr<nsISelectElement> selectElement = do_QueryInterface(aContainer);
if (selectElement) {
nsAutoString selSize;
aContainer->GetAttr(kNameSpaceID_None, nsHTMLAtoms::size, selSize);
if (!selSize.IsEmpty()) {
PRInt32 err;
if (selSize.ToInteger(&err) > 1)
return NS_OK;
}
}
}
PRBool treeChildren = tag.get() == nsXULAtoms::treechildren;
PRBool treeItem = tag.get() == nsXULAtoms::treeitem;
@ -8398,10 +8412,23 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,
// Just ignore outliner tags, anyway we don't create any frames for them.
if (tag == nsXULAtoms::outlinerchildren ||
tag == nsXULAtoms::outlineritem ||
tag == nsXULAtoms::outlinerrow ||
(UseXBLForms() && tag == nsHTMLAtoms::select))
tag == nsXULAtoms::outlinerrow)
return NS_OK;
// Ignore option elements inside a select (size > 1), if we are using XBL forms
if (UseXBLForms()) {
nsCOMPtr<nsISelectElement> selectElement = do_QueryInterface(aContainer);
if (selectElement) {
nsAutoString selSize;
aContainer->GetAttr(kNameSpaceID_None, nsHTMLAtoms::size, selSize);
if (!selSize.IsEmpty()) {
PRInt32 err;
if (selSize.ToInteger(&err) > 1)
return NS_OK;
}
}
}
PRBool treeChildren = tag && tag.get() == nsXULAtoms::treechildren;
PRBool treeItem = tag && tag.get() == nsXULAtoms::treeitem;
if (treeChildren || treeItem) {
@ -9300,10 +9327,23 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
// Just ignore outliner tags, anyway we don't create any frames for them.
if (tag == nsXULAtoms::outlinerchildren ||
tag == nsXULAtoms::outlineritem ||
tag == nsXULAtoms::outlinerrow ||
(UseXBLForms() && tag == nsHTMLAtoms::select))
tag == nsXULAtoms::outlinerrow)
return NS_OK;
// Ignore option elements inside a select (size > 1), if we are using XBL forms
if (UseXBLForms()) {
nsCOMPtr<nsISelectElement> selectElement = do_QueryInterface(aContainer);
if (selectElement) {
nsAutoString selSize;
aContainer->GetAttr(kNameSpaceID_None, nsHTMLAtoms::size, selSize);
if (!selSize.IsEmpty()) {
PRInt32 err;
if (selSize.ToInteger(&err) > 1)
return NS_OK;
}
}
}
PRBool treeChildren = tag && tag.get() == nsXULAtoms::treechildren;
PRBool treeItem = tag && tag.get() == nsXULAtoms::treeitem;
if (treeChildren || treeItem) {