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

disable notifies during synthetic content insertion

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@3051 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp
1998-06-03 15:55:49 +00:00
parent 17741db54e
commit b270330541
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/layout/generic/nsHTMLContainerFrame.cpp
View File

@@ -37,6 +37,7 @@
#include "nsIContentDelegate.h"
#include "nsIHTMLContent.h"
#include "nsHTMLParts.h"
#include "nsHTMLFrame.h"
NS_DEF_PTR(nsIStyleContext);
@@ -88,7 +89,8 @@ void nsHTMLContainerFrame::TriggerLink(nsIPresContext& aPresContext,
if (NS_OK == aPresContext.GetLinkHandler(&handler)) {
// Resolve url to an absolute url
nsIURL* docURL = nsnull;
nsIDocument* doc = mContent->GetDocument();
nsIDocument* doc = nsnull;
mContent->GetDocument(doc);
if (nsnull != doc) {
docURL = doc->GetDocumentURL();
NS_RELEASE(doc);
@@ -315,6 +317,11 @@ nsHTMLContainerFrame::CreateFrameFor(nsIPresContext* aPresContext,
aStyleContext, frame);
NS_RELEASE(delegate);
}
if (NS_OK == rv) {
// Wrap the frame in a view if necessary
rv = nsHTMLFrame::CreateViewForFrame(aPresContext, frame, aStyleContext,
PR_FALSE);
}
aResult = frame;
return rv;
}
@@ -435,10 +442,9 @@ nsHTMLContainerFrame::ProcessInitialReflow(nsIPresContext* aPresContext)
return rv;
}
// XXX
// Note: this will generate a content-inserted reflow operation
// which we need to discard.
mContent->InsertChildAt(bullet, 0);
// Insert the bullet. Do not allow an incremental reflow operation
// to occur.
mContent->InsertChildAt(bullet, 0, PR_FALSE);
}
return NS_OK;

16
mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
View File

@@ -37,6 +37,7 @@
#include "nsIContentDelegate.h"
#include "nsIHTMLContent.h"
#include "nsHTMLParts.h"
#include "nsHTMLFrame.h"
NS_DEF_PTR(nsIStyleContext);
@@ -88,7 +89,8 @@ void nsHTMLContainerFrame::TriggerLink(nsIPresContext& aPresContext,
if (NS_OK == aPresContext.GetLinkHandler(&handler)) {
// Resolve url to an absolute url
nsIURL* docURL = nsnull;
nsIDocument* doc = mContent->GetDocument();
nsIDocument* doc = nsnull;
mContent->GetDocument(doc);
if (nsnull != doc) {
docURL = doc->GetDocumentURL();
NS_RELEASE(doc);
@@ -315,6 +317,11 @@ nsHTMLContainerFrame::CreateFrameFor(nsIPresContext* aPresContext,
aStyleContext, frame);
NS_RELEASE(delegate);
}
if (NS_OK == rv) {
// Wrap the frame in a view if necessary
rv = nsHTMLFrame::CreateViewForFrame(aPresContext, frame, aStyleContext,
PR_FALSE);
}
aResult = frame;
return rv;
}
@@ -435,10 +442,9 @@ nsHTMLContainerFrame::ProcessInitialReflow(nsIPresContext* aPresContext)
return rv;
}
// XXX
// Note: this will generate a content-inserted reflow operation
// which we need to discard.
mContent->InsertChildAt(bullet, 0);
// Insert the bullet. Do not allow an incremental reflow operation
// to occur.
mContent->InsertChildAt(bullet, 0, PR_FALSE);
}
return NS_OK;