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

Tweaking XUL frame construction. Also adding in a temporary tweak to 

keep a NOTYETIMPLEMENTED from firing when an attribute in XML is
changed.  (Making it do a reflow rather than a reframe.)
This commit is contained in:
hyatt%netscape.com 1999-01-27 07:22:05 +00:00
Родитель 55c511ade9
Коммит 351a867c31
3 изменённых файлов: 168 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

57
content/html/style/src/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -55,6 +55,7 @@
#include "nsToolboxFrame.h"
#include "nsToolbarFrame.h"
#include "nsTreeIndentationFrame.h"
#include "nsTreeCellFrame.h"
#endif
//#define FRAMEBASED_COMPONENTS 1 // This is temporary please leave in for now - rods
@ -266,6 +267,31 @@ nsAbsoluteItems::nsAbsoluteItems(nsIFrame* aContainingBlock)
{
}
void
nsAbsoluteItems::AddAbsolutelyPositionedChild(nsIFrame* aChildFrame)
{
#ifdef NS_DEBUG
nsIFrame* parent;
aChildFrame->GetParent(parent);
NS_PRECONDITION(parent == containingBlock, "bad geometric parent");
#endif
if (nsnull == childList) {
childList = aChildFrame;
} else {
// Get the last frane in the list
nsIFrame* lastChild = nsnull;
for (nsIFrame* f = childList; nsnull != f; f->GetNextSibling(f)) {
lastChild = f;
}
lastChild->SetNextSibling(aChildFrame);
}
=======
>>>>>>> 3.141
}
// -----------------------------------------------------------
class HTMLStyleSheetImpl : public nsIHTMLStyleSheet,
@ -465,9 +491,35 @@ protected:
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAbsoluteItems,
nsFrameItems& aFrameItems,
<<<<<<< nsHTMLStyleSheet.cpp
PRBool& haltProcessing);
=======
nsAbsoluteItems& aFixedItems,
PRBool& haltProcessing);
>>>>>>> 3.141
<<<<<<< nsHTMLStyleSheet.cpp
nsresult ConstructTreeFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAboluteItems,
nsIFrame*& aNewFrame);
nsresult ConstructTreeBodyFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aNewScrollFrame,
nsIFrame*& aNewFrame);
nsresult ConstructTreeCellFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParentFrame,
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame);
=======
nsresult ConstructTreeFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
@ -490,6 +542,7 @@ protected:
nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame,
nsAbsoluteItems& aFixedItems);
>>>>>>> 3.141
#endif
nsresult ConstructFrameByDisplayType(nsIPresContext* aPresContext,
@ -2438,7 +2491,7 @@ HTMLStyleSheetImpl::ConstructTreeCellFrame(nsIPresContext* aPresContext,
nsresult rv;
// Create a table cell frame
rv = NS_NewTableCellFrame(aNewFrame);
rv = NS_NewTreeCellFrame(aNewFrame);
if (NS_SUCCEEDED(rv)) {
// Initialize the table cell frame
aNewFrame->Init(*aPresContext, aContent, aParentFrame, aStyleContext);
@ -3008,6 +3061,7 @@ HTMLStyleSheetImpl::ConstructFrame(nsIPresContext* aPresContext,
styleContext->GetStyleData(eStyleStruct_Display);
if (NS_STYLE_DISPLAY_NONE != display->mDisplay) {
nsIFrame* lastChild = aFrameItems.lastChild;
// Handle specific frame types
@ -3619,6 +3673,7 @@ HTMLStyleSheetImpl::AttributeChanged(nsIPresContext* aPresContext,
htmlContent->GetStyleHintForAttributeChange(aAttribute, &aHint);
NS_RELEASE(htmlContent);
}
else aHint = NS_STYLE_HINT_REFLOW;
}
switch (aHint) {

57
layout/html/style/src/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -55,6 +55,7 @@
#include "nsToolboxFrame.h"
#include "nsToolbarFrame.h"
#include "nsTreeIndentationFrame.h"
#include "nsTreeCellFrame.h"
#endif
//#define FRAMEBASED_COMPONENTS 1 // This is temporary please leave in for now - rods
@ -266,6 +267,31 @@ nsAbsoluteItems::nsAbsoluteItems(nsIFrame* aContainingBlock)
{
}
void
nsAbsoluteItems::AddAbsolutelyPositionedChild(nsIFrame* aChildFrame)
{
#ifdef NS_DEBUG
nsIFrame* parent;
aChildFrame->GetParent(parent);
NS_PRECONDITION(parent == containingBlock, "bad geometric parent");
#endif
if (nsnull == childList) {
childList = aChildFrame;
} else {
// Get the last frane in the list
nsIFrame* lastChild = nsnull;
for (nsIFrame* f = childList; nsnull != f; f->GetNextSibling(f)) {
lastChild = f;
}
lastChild->SetNextSibling(aChildFrame);
}
=======
>>>>>>> 3.141
}
// -----------------------------------------------------------
class HTMLStyleSheetImpl : public nsIHTMLStyleSheet,
@ -465,9 +491,35 @@ protected:
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAbsoluteItems,
nsFrameItems& aFrameItems,
<<<<<<< nsHTMLStyleSheet.cpp
PRBool& haltProcessing);
=======
nsAbsoluteItems& aFixedItems,
PRBool& haltProcessing);
>>>>>>> 3.141
<<<<<<< nsHTMLStyleSheet.cpp
nsresult ConstructTreeFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAboluteItems,
nsIFrame*& aNewFrame);
nsresult ConstructTreeBodyFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aNewScrollFrame,
nsIFrame*& aNewFrame);
nsresult ConstructTreeCellFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParentFrame,
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame);
=======
nsresult ConstructTreeFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
@ -490,6 +542,7 @@ protected:
nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame,
nsAbsoluteItems& aFixedItems);
>>>>>>> 3.141
#endif
nsresult ConstructFrameByDisplayType(nsIPresContext* aPresContext,
@ -2438,7 +2491,7 @@ HTMLStyleSheetImpl::ConstructTreeCellFrame(nsIPresContext* aPresContext,
nsresult rv;
// Create a table cell frame
rv = NS_NewTableCellFrame(aNewFrame);
rv = NS_NewTreeCellFrame(aNewFrame);
if (NS_SUCCEEDED(rv)) {
// Initialize the table cell frame
aNewFrame->Init(*aPresContext, aContent, aParentFrame, aStyleContext);
@ -3008,6 +3061,7 @@ HTMLStyleSheetImpl::ConstructFrame(nsIPresContext* aPresContext,
styleContext->GetStyleData(eStyleStruct_Display);
if (NS_STYLE_DISPLAY_NONE != display->mDisplay) {
nsIFrame* lastChild = aFrameItems.lastChild;
// Handle specific frame types
@ -3619,6 +3673,7 @@ HTMLStyleSheetImpl::AttributeChanged(nsIPresContext* aPresContext,
htmlContent->GetStyleHintForAttributeChange(aAttribute, &aHint);
NS_RELEASE(htmlContent);
}
else aHint = NS_STYLE_HINT_REFLOW;
}
switch (aHint) {

57
layout/style/nsHTMLStyleSheet.cpp
Просмотреть файл

@ -55,6 +55,7 @@
#include "nsToolboxFrame.h"
#include "nsToolbarFrame.h"
#include "nsTreeIndentationFrame.h"
#include "nsTreeCellFrame.h"
#endif
//#define FRAMEBASED_COMPONENTS 1 // This is temporary please leave in for now - rods
@ -266,6 +267,31 @@ nsAbsoluteItems::nsAbsoluteItems(nsIFrame* aContainingBlock)
{
}
void
nsAbsoluteItems::AddAbsolutelyPositionedChild(nsIFrame* aChildFrame)
{
#ifdef NS_DEBUG
nsIFrame* parent;
aChildFrame->GetParent(parent);
NS_PRECONDITION(parent == containingBlock, "bad geometric parent");
#endif
if (nsnull == childList) {
childList = aChildFrame;
} else {
// Get the last frane in the list
nsIFrame* lastChild = nsnull;
for (nsIFrame* f = childList; nsnull != f; f->GetNextSibling(f)) {
lastChild = f;
}
lastChild->SetNextSibling(aChildFrame);
}
=======
>>>>>>> 3.141
}
// -----------------------------------------------------------
class HTMLStyleSheetImpl : public nsIHTMLStyleSheet,
@ -465,9 +491,35 @@ protected:
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAbsoluteItems,
nsFrameItems& aFrameItems,
<<<<<<< nsHTMLStyleSheet.cpp
PRBool& haltProcessing);
=======
nsAbsoluteItems& aFixedItems,
PRBool& haltProcessing);
>>>>>>> 3.141
<<<<<<< nsHTMLStyleSheet.cpp
nsresult ConstructTreeFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAboluteItems,
nsIFrame*& aNewFrame);
nsresult ConstructTreeBodyFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aNewScrollFrame,
nsIFrame*& aNewFrame);
nsresult ConstructTreeCellFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParentFrame,
nsIStyleContext* aStyleContext,
nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame);
=======
nsresult ConstructTreeFrame(nsIPresContext* aPresContext,
nsIContent* aContent,
nsIFrame* aParent,
@ -490,6 +542,7 @@ protected:
nsAbsoluteItems& aAbsoluteItems,
nsIFrame*& aNewFrame,
nsAbsoluteItems& aFixedItems);
>>>>>>> 3.141
#endif
nsresult ConstructFrameByDisplayType(nsIPresContext* aPresContext,
@ -2438,7 +2491,7 @@ HTMLStyleSheetImpl::ConstructTreeCellFrame(nsIPresContext* aPresContext,
nsresult rv;
// Create a table cell frame
rv = NS_NewTableCellFrame(aNewFrame);
rv = NS_NewTreeCellFrame(aNewFrame);
if (NS_SUCCEEDED(rv)) {
// Initialize the table cell frame
aNewFrame->Init(*aPresContext, aContent, aParentFrame, aStyleContext);
@ -3008,6 +3061,7 @@ HTMLStyleSheetImpl::ConstructFrame(nsIPresContext* aPresContext,
styleContext->GetStyleData(eStyleStruct_Display);
if (NS_STYLE_DISPLAY_NONE != display->mDisplay) {
nsIFrame* lastChild = aFrameItems.lastChild;
// Handle specific frame types
@ -3619,6 +3673,7 @@ HTMLStyleSheetImpl::AttributeChanged(nsIPresContext* aPresContext,
htmlContent->GetStyleHintForAttributeChange(aAttribute, &aHint);
NS_RELEASE(htmlContent);
}
else aHint = NS_STYLE_HINT_REFLOW;
}
switch (aHint) {