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

Fixed FindFrameWithContent() to do a better job of recognizing placeholder

Browse Source 
frames and skipping them


git-svn-id: svn://10.0.0.236/trunk@17302 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy%netscape.com
1999-01-07 04:47:43 +00:00
parent 44f1a3899a
commit 0e2a9c299a
2 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/layout/base/nsPresShell.cpp
View File

@@ -47,6 +47,7 @@
#include "nsIDOMDocument.h"
#include "nsIDOMNode.h"
#include "nsIDOMElement.h"
#include "nsHTMLAtoms.h"
static PRBool gsNoisyRefs = PR_FALSE;
#undef NOISY
@@ -1154,15 +1155,21 @@ FindFrameWithContent(nsIFrame* aFrame, nsIContent* aContent)
aFrame->GetContent(frameContent);
if (frameContent == aContent) {
// XXX Sleazy hack to check whether this is a placeholder frame.
// If it is, we skip it and go on to (hopefully) find the
// absolutely positioned frame.
const nsStylePosition* position;
nsIStyleContext* styleContext;
nsIAtom* pseudoTag;
PRBool isPlaceholder = PR_FALSE;
aFrame->GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&)position);
if ((NS_STYLE_POSITION_ABSOLUTE != position->mPosition) ||
!IsZeroSizedFrame(aFrame)) {
NS_RELEASE(frameContent);
// If it's a placeholder frame, then ignore it and keep looking for the
// primary frame
aFrame->GetStyleContext(styleContext);
styleContext->GetPseudoType(pseudoTag);
if (pseudoTag == nsHTMLAtoms::placeholderPseudo) {
isPlaceholder = PR_TRUE;
}
NS_RELEASE(styleContext);
NS_IF_RELEASE(pseudoTag);
if (!isPlaceholder) {
return aFrame;
}
}

23
mozilla/layout/html/base/src/nsPresShell.cpp
View File

@@ -47,6 +47,7 @@
#include "nsIDOMDocument.h"
#include "nsIDOMNode.h"
#include "nsIDOMElement.h"
#include "nsHTMLAtoms.h"
static PRBool gsNoisyRefs = PR_FALSE;
#undef NOISY
@@ -1154,15 +1155,21 @@ FindFrameWithContent(nsIFrame* aFrame, nsIContent* aContent)
aFrame->GetContent(frameContent);
if (frameContent == aContent) {
// XXX Sleazy hack to check whether this is a placeholder frame.
// If it is, we skip it and go on to (hopefully) find the
// absolutely positioned frame.
const nsStylePosition* position;
nsIStyleContext* styleContext;
nsIAtom* pseudoTag;
PRBool isPlaceholder = PR_FALSE;
aFrame->GetStyleData(eStyleStruct_Position, (const nsStyleStruct*&)position);
if ((NS_STYLE_POSITION_ABSOLUTE != position->mPosition) ||
!IsZeroSizedFrame(aFrame)) {
NS_RELEASE(frameContent);
// If it's a placeholder frame, then ignore it and keep looking for the
// primary frame
aFrame->GetStyleContext(styleContext);
styleContext->GetPseudoType(pseudoTag);
if (pseudoTag == nsHTMLAtoms::placeholderPseudo) {
isPlaceholder = PR_TRUE;
}
NS_RELEASE(styleContext);
NS_IF_RELEASE(pseudoTag);
if (!isPlaceholder) {
return aFrame;
}
}