Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-27 12:15:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 363791 - Crash [@ nsTreeBodyFrame::PrefillPropertyArray] involving removal of <treecols>

Browse Source 
p=asqueella@gmail.com (Nickolay Ponomarev)
r=neil@parwaycc.co.uk (Neil Rashbrook)
sr=roc@ocallahan.org (Robert O'Callahan)
This commit is contained in:
gijskruitbosch%gmail.com 2006-12-29 13:20:23 +00:00
parent 4f378b22ce
commit fed6e8613b
3 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/xul/content/src/nsXULElement.cpp
View File

@ -1864,8 +1864,8 @@ nsXULElement::GetBoxObject(nsIBoxObject** aResult)
// XXX sXBL/XBL2 issue! Owner or current document?
nsCOMPtr<nsIDOMNSDocument> nsDoc(do_QueryInterface(GetCurrentDoc()));
NS_ENSURE_TRUE(nsDoc, NS_ERROR_FAILURE);
return nsDoc->GetBoxObjectFor(this, aResult);
return nsDoc ? nsDoc->GetBoxObjectFor(this, aResult) : NS_ERROR_FAILURE;
}
// Methods for setting/getting attributes from nsIDOMXULElement

61
layout/xul/base/src/tree/src/nsTreeColFrame.cpp
View File

@ -47,6 +47,7 @@
#include "nsIBoxObject.h"
#include "nsIDOMElement.h"
#include "nsITreeBoxObject.h"
#include "nsITreeColumns.h"
#include "nsIDOMXULTreeElement.h"
#include "nsDisplayList.h"
@ -91,17 +92,14 @@ nsTreeColFrame::Init(nsIContent* aContent,
nsIFrame* aPrevInFlow)
{
nsresult rv = nsBoxFrame::Init(aContent, aParent, aPrevInFlow);
EnsureColumns();
if (mColumns)
mColumns->InvalidateColumns();
InvalidateColumns();
return rv;
}
void
nsTreeColFrame::Destroy()
{
if (mColumns)
mColumns->InvalidateColumns();
InvalidateColumns();
nsBoxFrame::Destroy();
}
@ -180,9 +178,7 @@ nsTreeColFrame::AttributeChanged(PRInt32 aNameSpaceID,
aModType);
if (aAttribute == nsGkAtoms::ordinal || aAttribute == nsGkAtoms::primary) {
EnsureColumns();
if (mColumns)
mColumns->InvalidateColumns();
InvalidateColumns();
}
return rv;
@ -197,30 +193,43 @@ nsTreeColFrame::SetBounds(nsBoxLayoutState& aBoxLayoutState,
nsresult rv = nsBoxFrame::SetBounds(aBoxLayoutState, aRect,
aRemoveOverflowArea);
if (mRect.width != oldWidth) {
EnsureColumns();
if (mColumns) {
nsCOMPtr<nsITreeBoxObject> tree;
mColumns->GetTree(getter_AddRefs(tree));
if (tree)
tree->Invalidate();
nsITreeBoxObject* treeBoxObject = GetTreeBoxObject();
if (treeBoxObject) {
treeBoxObject->Invalidate();
}
}
return rv;
}
void
nsTreeColFrame::EnsureColumns()
nsITreeBoxObject*
nsTreeColFrame::GetTreeBoxObject()
{
if (!mColumns) {
// Get our parent node.
nsIContent* parent = mContent->GetParent();
if (parent) {
nsIContent* grandParent = parent->GetParent();
if (grandParent) {
nsCOMPtr<nsIDOMXULTreeElement> treeElement = do_QueryInterface(grandParent);
if (treeElement)
treeElement->GetColumns(getter_AddRefs(mColumns));
}
nsITreeBoxObject* result = nsnull;
nsIContent* parent = mContent->GetParent();
if (parent) {
nsIContent* grandParent = parent->GetParent();
nsCOMPtr<nsIDOMXULElement> treeElement = do_QueryInterface(grandParent);
if (treeElement) {
nsCOMPtr<nsIBoxObject> boxObject;
treeElement->GetBoxObject(getter_AddRefs(boxObject));
nsCOMPtr<nsITreeBoxObject> treeBoxObject = do_QueryInterface(boxObject);
result = treeBoxObject.get();
}
}
return result;
}
void
nsTreeColFrame::InvalidateColumns()
{
nsITreeBoxObject* treeBoxObject = GetTreeBoxObject();
if (treeBoxObject) {
nsCOMPtr<nsITreeColumns> columns;
treeBoxObject->GetColumns(getter_AddRefs(columns));
if (columns)
columns->InvalidateColumns();
}
}

16
layout/xul/base/src/tree/src/nsTreeColFrame.h
View File

@ -37,7 +37,8 @@
* ***** END LICENSE BLOCK ***** */
#include "nsBoxFrame.h"
#include "nsITreeColumns.h"
class nsITreeBoxObject;
nsIFrame* NS_NewTreeColFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext,
@ -79,7 +80,14 @@ public:
protected:
virtual ~nsTreeColFrame();
void EnsureColumns();
nsCOMPtr<nsITreeColumns> mColumns;
/**
* @return the tree box object of the tree this column belongs to, or nsnull.
*/
nsITreeBoxObject* GetTreeBoxObject();
/**
* Helper method that gets the nsITreeColumns object this column belongs to
* and calls InvalidateColumns() on it.
*/
void InvalidateColumns();
};