зеркало из https://github.com/mozilla/pjs.git
Bug 321073 - "ASSERTION: Should not be called: 'Error' (nsGridLayout2::GetRowCount should not be called)". Patch by Andreas Lange, r=enndeakin, sr=neil rashbrrok.
This commit is contained in:
Родитель
42fdb392de
Коммит
aaad7269fd
|
@ -78,7 +78,6 @@ public:
|
|||
virtual void DirtyRows(nsIBox* aBox, nsBoxLayoutState& aState) { NS_NOTREACHED("Should not be called"); }
|
||||
virtual PRInt32 BuildRows(nsIBox* aBox, nsGridRow* aRows) { NS_NOTREACHED("Should not be called"); return 0; }
|
||||
virtual nsMargin GetTotalMargin(nsIBox* aBox, PRBool aIsHorizontal);
|
||||
virtual PRInt32 GetRowCount() { NS_NOTREACHED("Should not be called"); return 0; }
|
||||
virtual Type GetType() { return eGrid; }
|
||||
NS_IMETHOD ChildrenInserted(nsIBox* aBox, nsBoxLayoutState& aState,
|
||||
nsIBox* aPrevBox, nsIBox* aChildList);
|
||||
|
|
|
@ -67,7 +67,6 @@ public:
|
|||
virtual void CountRowsColumns(nsIBox* aBox, PRInt32& aRowCount, PRInt32& aComputedColumnCount);
|
||||
virtual void DirtyRows(nsIBox* aBox, nsBoxLayoutState& aState);
|
||||
virtual PRInt32 BuildRows(nsIBox* aBox, nsGridRow* aRows);
|
||||
virtual PRInt32 GetRowCount() { return 1; }
|
||||
virtual Type GetType() { return eRowLeaf; }
|
||||
|
||||
protected:
|
||||
|
|
|
@ -104,7 +104,7 @@ public:
|
|||
virtual void DirtyRows(nsIBox* aBox, nsBoxLayoutState& aState)=0;
|
||||
virtual PRInt32 BuildRows(nsIBox* aBox, nsGridRow* aRows)=0;
|
||||
virtual nsMargin GetTotalMargin(nsIBox* aBox, PRBool aIsHorizontal)=0;
|
||||
virtual PRInt32 GetRowCount()=0;
|
||||
virtual PRInt32 GetRowCount() { return 1; }
|
||||
|
||||
/**
|
||||
* Return the level of the grid hierarchy this grid part represents.
|
||||
|
|
Загрузка…
Ссылка в новой задаче