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

Don't reframe leaf frames just because they don't have generated content that

Browse Source 
style says they should have -- leaves just don't have generated content.  Bug
315541, r+sr=dbaron


git-svn-id: svn://10.0.0.236/trunk@184305 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2005-11-08 18:20:47 +00:00
parent 112c33275c
commit 8a03d5d2ea
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/layout/base/nsFrameManager.cpp
View File

@@ -1225,9 +1225,10 @@ nsFrameManager::ReResolveStyleContext(nsPresContext *aPresContext,
if (!(aMinChange & nsChangeHint_ReconstructFrame)) {
// Make sure not to do this for pseudo-frames -- those can't have :before
// or :after content.
// or :after content. Neither can non-elements or leaf frames.
if (!pseudoTag && localContent &&
localContent->IsContentOfType(nsIContent::eELEMENT)) {
localContent->IsContentOfType(nsIContent::eELEMENT) &&
!aFrame->IsLeaf()) {
// Check for a new :before pseudo and an existing :before
// frame, but only if the frame is the first-in-flow.
nsIFrame* prevInFlow = aFrame->GetPrevInFlow();
@@ -1250,11 +1251,12 @@ nsFrameManager::ReResolveStyleContext(nsPresContext *aPresContext,
if (!(aMinChange & nsChangeHint_ReconstructFrame)) {
// Make sure not to do this for pseudo-frames -- those can't have :before
// or :after content.
// or :after content. Neither can non-elements or leaf frames.
if (!pseudoTag && localContent &&
localContent->IsContentOfType(nsIContent::eELEMENT)) {
localContent->IsContentOfType(nsIContent::eELEMENT) &&
!aFrame->IsLeaf()) {
// Check for new :after content, but only if the frame is the
// first-in-flow.
// last-in-flow.
nsIFrame* nextInFlow = aFrame->GetNextInFlow();
if (!nextInFlow) {