Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes bug 18039, it doesn't call WipeContainingBlock for select frames

Browse Source 
This needs a better fix, filed bug 18366
r=kmcclusk


git-svn-id: svn://10.0.0.236/trunk@53015 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rods%netscape.com 1999-11-09 22:36:05 +00:00
parent b8aec44d1a
commit c8a56bd594
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/layout/base/nsCSSFrameConstructor.cpp
View File

@ -5400,9 +5400,18 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,
if (NS_SUCCEEDED(result) && firstAppendedFrame) {
// Perform special check for diddling around with the frames in
// a special inline frame.
if (WipeContainingBlock(aPresContext, state, blockContent, adjustedParentFrame,
frameItems.childList)) {
return NS_OK;
// XXX Bug 18366
// Although select frame are inline we do not want to call
// WipeContainingBlock because it will throw away the entire selct frame and
// start over which is something we do not want to do
//
nsCOMPtr<nsIDOMHTMLSelectElement> selectContent(do_QueryInterface(blockContent));
if (selectContent) {
if (WipeContainingBlock(aPresContext, state, blockContent, adjustedParentFrame,
frameItems.childList)) {
return NS_OK;
}
}
// Append the flowed frames to the principal child list

15
mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -5400,9 +5400,18 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext,
if (NS_SUCCEEDED(result) && firstAppendedFrame) {
// Perform special check for diddling around with the frames in
// a special inline frame.
if (WipeContainingBlock(aPresContext, state, blockContent, adjustedParentFrame,
frameItems.childList)) {
return NS_OK;
// XXX Bug 18366
// Although select frame are inline we do not want to call
// WipeContainingBlock because it will throw away the entire selct frame and
// start over which is something we do not want to do
//
nsCOMPtr<nsIDOMHTMLSelectElement> selectContent(do_QueryInterface(blockContent));
if (selectContent) {
if (WipeContainingBlock(aPresContext, state, blockContent, adjustedParentFrame,
frameItems.childList)) {
return NS_OK;
}
}
// Append the flowed frames to the principal child list