mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Add a comment and assertion to the fix for bug 370174. r+sr=roc on the original patch. blocking1.9=dbaron
This commit is contained in:
parent
c8231d11c6
commit
8c675558f6
@ -4519,6 +4519,7 @@ FindBlockFrameOrBR(nsIFrame* aFrame, nsDirection aDirection)
|
|||||||
{
|
{
|
||||||
nsContentAndOffset result;
|
nsContentAndOffset result;
|
||||||
result.mContent = nsnull;
|
result.mContent = nsnull;
|
||||||
|
result.mOffset = 0;
|
||||||
|
|
||||||
if (aFrame->IsGeneratedContentFrame())
|
if (aFrame->IsGeneratedContentFrame())
|
||||||
return result;
|
return result;
|
||||||
@ -4540,6 +4541,10 @@ FindBlockFrameOrBR(nsIFrame* aFrame, nsDirection aDirection)
|
|||||||
aFrame->GetType() == nsGkAtoms::brFrame) {
|
aFrame->GetType() == nsGkAtoms::brFrame) {
|
||||||
nsIContent* content = aFrame->GetContent();
|
nsIContent* content = aFrame->GetContent();
|
||||||
result.mContent = content->GetParent();
|
result.mContent = content->GetParent();
|
||||||
|
// In some cases (bug 310589, bug 370174) we end up here with a null content.
|
||||||
|
// This probably shouldn't ever happen, but since it sometimes does, we want
|
||||||
|
// to avoid crashing here.
|
||||||
|
NS_ASSERTION(result.mContent, "Unexpected orphan content");
|
||||||
if (result.mContent)
|
if (result.mContent)
|
||||||
result.mOffset = result.mContent->IndexOf(content) +
|
result.mOffset = result.mContent->IndexOf(content) +
|
||||||
(aDirection == eDirPrevious ? 1 : 0);
|
(aDirection == eDirPrevious ? 1 : 0);
|
||||||
|
Loading…
Reference in New Issue
Block a user