Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 10:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

r=buster. bug 31644. FindPrimaryFrameFor() now accounts for "special" frames created when blocks are encountered within inlines.

Browse Source
This commit is contained in:
nisheeth%netscape.com 2000-03-23 23:18:56 +00:00
parent 1649c34718
commit a89fa8ead5
4 changed files with 66 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
layout/base/nsCSSFrameConstructor.cpp
View File

@ -9135,13 +9135,14 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsIPresShell* aPresShell,
return rv;
}
// Helper function that searches the immediate child frames for a frame that
// maps the specified content object
static nsIFrame*
FindFrameWithContent(nsIPresContext* aPresContext,
nsIFrame* aParentFrame,
nsIContent* aParentContent,
nsIContent* aContent)
// Helper function that searches the immediate child frames
// (and their children if the frames are "special")
// for a frame that maps the specified content object
nsIFrame*
nsCSSFrameConstructor::FindFrameWithContent(nsIPresContext* aPresContext,
nsIFrame* aParentFrame,
nsIContent* aParentContent,
nsIContent* aContent)
{
NS_PRECONDITION(aParentFrame, "No frame to search!");
if (!aParentFrame) {
@ -9178,7 +9179,9 @@ keepLooking:
// We search the immediate children only, but if the child frame has
// the same content pointer as its parent then we need to search its
// child frames, too
if (kidContent.get() == aParentContent) {
// We also need to search the child frames' children if the child frame
// is a "special" frame
if (kidContent.get() == aParentContent || IsFrameSpecial(aPresContext, kidFrame)) {
nsIFrame* matchingFrame = FindFrameWithContent(aPresContext, kidFrame, aParentContent,
aContent);
@ -9250,18 +9253,21 @@ nsCSSFrameConstructor::FindPrimaryFrameFor(nsIPresContext* aPresContext,
break;
}
else {
// We need to check parentFrame's sibling frame as well
parentFrame->GetNextSibling(&parentFrame);
if (!parentFrame) {
break;
// If this is a special frame, we need to go up the parent chain
// until we hit a special frame that has a next sibling.
nsIFrame* sibling = nsnull;
while (parentFrame && IsFrameSpecial(aFrameManager, parentFrame)) {
parentFrame->GetNextSibling(&sibling);
if (sibling)
break;
else
parentFrame->GetParent(&parentFrame);
}
else {
nsCOMPtr<nsIContent>nextParentContent;
parentFrame->GetContent(getter_AddRefs(nextParentContent));
if (parentContent!=nextParentContent) {
break;
}
}
if (sibling && IsFrameSpecial(aFrameManager, sibling))
parentFrame = sibling;
else
break;
}
}
}

8
layout/base/nsCSSFrameConstructor.h
View File

@ -800,6 +800,14 @@ protected:
nsresult RecreateEntireFrameTree(nsIPresContext* aPresContext);
// Helper function that searches the immediate child frames
// (and their children if the frames are "special")
// for a frame that maps the specified content object
nsIFrame* FindFrameWithContent(nsIPresContext* aPresContext,
nsIFrame* aParentFrame,
nsIContent* aParentContent,
nsIContent* aContent);
//----------------------------------------
// Methods support :first-letter style

44
layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -9135,13 +9135,14 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsIPresShell* aPresShell,
return rv;
}
// Helper function that searches the immediate child frames for a frame that
// maps the specified content object
static nsIFrame*
FindFrameWithContent(nsIPresContext* aPresContext,
nsIFrame* aParentFrame,
nsIContent* aParentContent,
nsIContent* aContent)
// Helper function that searches the immediate child frames
// (and their children if the frames are "special")
// for a frame that maps the specified content object
nsIFrame*
nsCSSFrameConstructor::FindFrameWithContent(nsIPresContext* aPresContext,
nsIFrame* aParentFrame,
nsIContent* aParentContent,
nsIContent* aContent)
{
NS_PRECONDITION(aParentFrame, "No frame to search!");
if (!aParentFrame) {
@ -9178,7 +9179,9 @@ keepLooking:
// We search the immediate children only, but if the child frame has
// the same content pointer as its parent then we need to search its
// child frames, too
if (kidContent.get() == aParentContent) {
// We also need to search the child frames' children if the child frame
// is a "special" frame
if (kidContent.get() == aParentContent || IsFrameSpecial(aPresContext, kidFrame)) {
nsIFrame* matchingFrame = FindFrameWithContent(aPresContext, kidFrame, aParentContent,
aContent);
@ -9250,18 +9253,21 @@ nsCSSFrameConstructor::FindPrimaryFrameFor(nsIPresContext* aPresContext,
break;
}
else {
// We need to check parentFrame's sibling frame as well
parentFrame->GetNextSibling(&parentFrame);
if (!parentFrame) {
break;
// If this is a special frame, we need to go up the parent chain
// until we hit a special frame that has a next sibling.
nsIFrame* sibling = nsnull;
while (parentFrame && IsFrameSpecial(aFrameManager, parentFrame)) {
parentFrame->GetNextSibling(&sibling);
if (sibling)
break;
else
parentFrame->GetParent(&parentFrame);
}
else {
nsCOMPtr<nsIContent>nextParentContent;
parentFrame->GetContent(getter_AddRefs(nextParentContent));
if (parentContent!=nextParentContent) {
break;
}
}
if (sibling && IsFrameSpecial(aFrameManager, sibling))
parentFrame = sibling;
else
break;
}
}
}

8
layout/html/style/src/nsCSSFrameConstructor.h
View File

@ -800,6 +800,14 @@ protected:
nsresult RecreateEntireFrameTree(nsIPresContext* aPresContext);
// Helper function that searches the immediate child frames
// (and their children if the frames are "special")
// for a frame that maps the specified content object
nsIFrame* FindFrameWithContent(nsIPresContext* aPresContext,
nsIFrame* aParentFrame,
nsIContent* aParentContent,
nsIContent* aContent);
//----------------------------------------
// Methods support :first-letter style