mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 384037. Eliminate nsFrameNavigator and switch XUL splitters to using nsFrameList instead. Also add a check so that we don't crash when a splitter's parent is not a XUL box. r+sr=dbaron 

--HG--
extra : rebase_source : 2438d96782b0d3c976fe7adf4f8e167811d76e64
This commit is contained in:
Robert O'Callahan 2009-04-25 20:33:32 +12:00
Родитель 970e0cc404
Коммит 9b9d496e09
9 изменённых файлов: 42 добавлений и 206 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
layout/generic/nsFrameList.cpp
Просмотреть файл

@ -284,6 +284,18 @@ nsFrameList::FrameAt(PRInt32 aIndex) const
return frame;
}
PRInt32
nsFrameList::IndexOf(nsIFrame* aFrame) const
{
PRInt32 count = 0;
for (nsIFrame* f = mFirstChild; f; f = f->GetNextSibling()) {
if (f == aFrame)
return count;
++count;
}
return -1;
}
PRBool
nsFrameList::ContainsFrame(const nsIFrame* aFrame) const
{

1
layout/generic/nsFrameList.h
Просмотреть файл

@ -143,6 +143,7 @@ public:
nsIFrame* LastChild() const;
nsIFrame* FrameAt(PRInt32 aIndex) const;
PRInt32 IndexOf(nsIFrame* aFrame) const;
PRBool IsEmpty() const {
return nsnull == mFirstChild;

1
layout/xul/base/src/Makefile.in
Просмотреть файл

@ -109,7 +109,6 @@ CPPSRCS += \
nsLeafBoxFrame.cpp \
nsTextBoxFrame.cpp \
nsGroupBoxFrame.cpp \
nsFrameNavigator.cpp \
nsSplitterFrame.cpp \
nsDeckFrame.cpp \
nsProgressMeterFrame.cpp \

9
layout/xul/base/src/crashtests/384037-1.xhtml Normal file
Просмотреть файл

@ -0,0 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<body>
<xul:splitter id="s" collapse="both" state="collapsed" />
</body>
</html>

1
layout/xul/base/src/crashtests/crashtests.list
Просмотреть файл

@ -29,6 +29,7 @@ load 377592-1.svg
load 382746-1.xul
load 382899-1.xul
load 383236-1.xul
load 384037-1.xhtml
load 384105-1.html
load 384491-1.xhtml
load 384871-1.html

1
layout/xul/base/src/nsBoxFrame.cpp
Просмотреть файл

@ -76,7 +76,6 @@
#include "nsIViewManager.h"
#include "nsIView.h"
#include "nsIPresShell.h"
#include "nsFrameNavigator.h"
#include "nsCSSRendering.h"
#include "nsIServiceManager.h"
#include "nsIBoxLayout.h"

126
layout/xul/base/src/nsFrameNavigator.cpp
Просмотреть файл

@ -1,126 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla Communicator client code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
//
// Eric Vaughan
// Netscape Communications
//
// See documentation in associated header file
//
#include "nsFrameNavigator.h"
#include "nsCOMPtr.h"
#include "nsIContent.h"
#include "nsIFrame.h"
nsIBox*
nsFrameNavigator::GetChildBeforeAfter(nsPresContext* aPresContext,
nsIBox* start, PRBool before)
{
nsIBox* parent = start->GetParentBox();
PRInt32 index = IndexOf(aPresContext, parent,start);
PRInt32 count = CountFrames(aPresContext, parent);
if (index == -1)
return nsnull;
if (before) {
if (index == 0) {
return nsnull;
}
return GetChildAt(aPresContext, parent, index-1);
}
if (index == count-1)
return nsnull;
return GetChildAt(aPresContext, parent, index+1);
}
PRInt32
nsFrameNavigator::IndexOf(nsPresContext* aPresContext, nsIBox* parent, nsIBox* child)
{
PRInt32 count = 0;
nsIBox* box = parent->GetChildBox();
while (box)
{
if (box == child)
return count;
box = box->GetNextBox();
count++;
}
return -1;
}
PRInt32
nsFrameNavigator::CountFrames(nsPresContext* aPresContext, nsIBox* aBox)
{
PRInt32 count = 0;
nsIBox* box = aBox->GetChildBox();
while (box)
{
box = box->GetNextBox();
count++;
}
return count;
}
nsIBox*
nsFrameNavigator::GetChildAt(nsPresContext* aPresContext, nsIBox* parent, PRInt32 index)
{
PRInt32 count = 0;
nsIBox* box = parent->GetChildBox();
while (box)
{
if (count == index)
return box;
box = box->GetNextBox();
count++;
}
return nsnull;
}

65
layout/xul/base/src/nsFrameNavigator.h
Просмотреть файл

@ -1,65 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla Communicator client code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/**
Eric D Vaughan
This class lays out its children either vertically or horizontally
**/
#ifndef nsGrippyFrame_h___
#define nsGrippyFrame_h___
#include "nsIFrame.h"
#include "nsIAtom.h"
#include "nsCOMPtr.h"
class nsFrameNavigator
{
public:
static nsIBox* GetChildBeforeAfter(nsPresContext* aPresContext, nsIBox* start, PRBool before);
static nsIBox* GetChildAt(nsPresContext* aPresContext, nsIBox* parent, PRInt32 index);
static PRInt32 IndexOf(nsPresContext* aPresContext, nsIBox* parent, nsIBox* child);
static PRInt32 CountFrames(nsPresContext* aPresContext, nsIBox* aFrame);
};
#endif

32
layout/xul/base/src/nsSplitterFrame.cpp
Просмотреть файл

@ -60,7 +60,7 @@
#include "nsIScrollableView.h"
#include "nsIDOMMouseEvent.h"
#include "nsIPresShell.h"
#include "nsFrameNavigator.h"
#include "nsFrameList.h"
#include "nsHTMLParts.h"
#include "nsILookAndFeel.h"
#include "nsStyleContext.h"
@ -740,15 +740,17 @@ nsSplitterFrameInner::MouseDown(nsIDOMEvent* aMouseEvent)
mParentBox = mOuter->GetParentBox();
if (!mParentBox)
return NS_OK;
// get our index
nsPresContext* outerPresContext = mOuter->PresContext();
nscoord childIndex = nsFrameNavigator::IndexOf(outerPresContext, mParentBox, mOuter);
// if it's 0 then stop right here.
if (childIndex == 0)
nsFrameList siblingList(mParentBox->GetFirstChild(nsnull));
PRInt32 childIndex = siblingList.IndexOf(mOuter);
// if it's 0 (or not found) then stop right here.
// It might be not found if we're not in the parent's primary frame list.
if (childIndex <= 0)
return NS_OK;
PRInt32 childCount = nsFrameNavigator::CountFrames(outerPresContext, mParentBox);
PRInt32 childCount = siblingList.GetLength();
// if it's the last index then we need to allow for resizeafter="grow"
if (childIndex == childCount - 1 && GetResizeAfter() != Grow)
return NS_OK;
@ -973,14 +975,18 @@ nsSplitterFrameInner::UpdateState()
return;
}
if (SupportsCollapseDirection(Before) || SupportsCollapseDirection(After)) {
nsIBox* splitter = mOuter;
if ((SupportsCollapseDirection(Before) || SupportsCollapseDirection(After)) &&
mOuter->GetParent()->IsBoxFrame()) {
// Find the splitter's immediate sibling.
nsIBox* splitterSibling =
nsFrameNavigator::GetChildBeforeAfter(mOuter->PresContext(), splitter,
(newState == CollapsedBefore ||
mState == CollapsedBefore));
if (splitterSibling) {
nsIFrame* splitterSibling;
if (newState == CollapsedBefore || mState == CollapsedBefore) {
splitterSibling =
nsFrameList(mOuter->GetParent()).GetPrevSiblingFor(mOuter);
} else {
splitterSibling = mOuter->GetNextSibling();
}
if (splitterSibling && splitterSibling->IsBoxFrame()) {
nsCOMPtr<nsIContent> sibling = splitterSibling->GetContent();
if (sibling) {
if (mState == CollapsedBefore || mState == CollapsedAfter) {